Changeset 25022 for branches/eam_branches/20090715/pstamp/scripts/dquery_finish.pl

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• pstamp/scripts/dquery_finish.pl (modified) (5 diffs)

branches/eam_branches/20090715/pstamp/scripts/dquery_finish.pl

@@ -20 +20 @@
 use PS::IPP::Config qw( :standard );
 
-my ( $req_id, $req_name, $req_file, $product, $dbname, $verbose, $save_temps );
+my ( $req_id, $req_name, $req_file, $product, $dbname, $dbserver, $verbose, $save_temps );
 
 GetOptions(
@@ -28 +28 @@
            'product=s'  => \$product,
            'dbname=s'   => \$dbname,
+           'dbserver=s' => \$dbserver,
            'verbose'    => \$verbose,
            'save-temps' => \$save_temps,
@@ -56 +57 @@
 my $outputDataStoreRoot = metadataLookupStr($ipprc->{_siteConfig}, 'DATA_STORE_ROOT');
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $outputDataStoreRoot; # lookup failure outputs a message
+
+if (!$dbserver) {
+    $dbserver = metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+}
 
 if ($product eq "NULL") {
@@ -89 +94 @@
     my $command = "$pstamptool -listjob -req_id $req_id";
     $command .= " -dbname $dbname" if $dbname;
+    $command .= " -dbserver $dbserver" if $dbserver;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
@@ -149 +155 @@
     $command   .= " -fault $fault" if $fault;
     $command   .= " -dbname $dbname" if $dbname;
+    $command   .= " -dbserver $dbserver" if $dbserver;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);