Changeset 35902

Timestamp:

Aug 7, 2013, 12:32:53 PM (13 years ago)

Author:

bills

Message:

fix a couple of bugs checked in by mistake.
Don't pass dbname and dbserver to ppstamp. They aren't needed and the values in the script are
pstamp database not the image database.

File:

• trunk/pstamp/scripts/pstamp_job_run.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -155 +155 @@
     if ($stage eq 'chip' or $stage eq 'warp') {
         my $cam_id = $params->{cam_id};
+        if (!$cam_id) {
+            carp "no cam_id found in job params\n";
+            exit $PS_EXIT_PROG_ERROR;
+        }
         ($calib_fd, $calibfile) = tempfile ("$outdir/calib.XXXX", UNLINK => !$save_temps);
         close $calib_fd;
 
-        my $command = "$psgetcalibinfo --cam_id $cam_id --output $calibfile";
+        my $command = "$psgetcalibinfo --cam_id $cam_id --output $calibfile --dbname $params->{imagedb}";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);
@@ -184 +188 @@
     $command .= " -stage $stage";
     $command .= " -forheader $calibfile" if $calibfile;
-    $command .= " -dbname $dbname" if $dbname;
-    $command .= " -dbserver $dbserver" if $dbserver;
+#    $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);