Changeset 24951 for branches/czw_branch/cleanup/pstamp/scripts/pstamp_job_run.pl

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (7 diffs)

branches/czw_branch/cleanup/pstamp/scripts/pstamp_job_run.pl

@@ -17 +17 @@
 my $verbose;
 my $dbname;
+my $dbserver;
 my $job_id;
 my $redirect_output;
@@ -25 +26 @@
 
 GetOptions(
-    'job_id=s'      =>  \$job_id,
-    'output_base=s' =>  \$output_base,
-    'redirect-output' => \$redirect_output,
-    'dbname=s'      =>  \$dbname,
-    'verbose'       =>  \$verbose,
+    'job_id=s'          =>  \$job_id,
+    'output_base=s'     =>  \$output_base,
+    'redirect-output'   => \$redirect_output,
+    'dbname=s'          =>  \$dbname,
+    'dbserver=s'        =>  \$dbserver,
+    'verbose'           =>  \$verbose,
 );
 
@@ -65 +67 @@
 }
 
+if (!$dbserver) {
+    $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+}
+
 my $missing_tools;
 
@@ -83 +89 @@
     my $command = "$pstamptool -pendingjob -job_id $job_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);
@@ -118 +125 @@
     my $command = "$ppstamp -file $uri $outputBase $argString";
     $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);
@@ -172 +180 @@
     my $command = "$pstamp_get_image_job --job_id $job_id --uri $uri --out_dir $outputBase --rownum $rownum";
     $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);
@@ -191 +200 @@
     my $command = "$pstamptool -updatejob -job_id $job_id -state stop -fault $jobStatus";
     $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);