Index: trunk/pstamp/scripts/dqueryparse.pl
===================================================================
--- trunk/pstamp/scripts/dqueryparse.pl	(revision 19221)
+++ trunk/pstamp/scripts/dqueryparse.pl	(revision 24831)
@@ -26,5 +26,5 @@
 		       );
 
-my ($req_file, $req_id, $out_dir, $product, $mode, $dbname, $verbose, $save_temps);
+my ($req_file, $req_id, $out_dir, $product, $mode, $dbname, $dbserver, $verbose, $save_temps);
 
 #
@@ -39,4 +39,5 @@
         'mode=s'          =>      \$mode,
         'dbname=s'        =>      \$dbname,
+        'dbserver=s'      =>      \$dbserver,
         'verbose'         =>      \$verbose,
         'save-temps'      =>      \$save_temps,
@@ -69,4 +70,9 @@
     warn("Can't find required tools.");
     exit ($PS_EXIT_CONFIG_ERROR);
+}
+
+if (!$dbserver) {
+    my $ipprc = = PS::IPP::Config->new();
+    $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
 }
 
@@ -131,4 +137,5 @@
     $command .= " -rownum 0";
     $command .= " -dbname $dbname" if $dbname;
+    $command .= " -dbserver $dbserver" if $dbserver;
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -153,4 +160,5 @@
     $command .= " -fault $result" if $result;
     $command .= " -dbname $dbname" if $dbname;
+    $command .= " -dbserver $dbserver" if $dbserver;
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =