Changeset 20256 for trunk/pstamp/scripts/pstampparse.pl

Timestamp:

Oct 17, 2008, 3:58:39 PM (18 years ago)

Author:

bills

Message:

Don't give up if one row doesn't generate any jobs.
Only return an error if no jobs are queued.

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (8 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -123 +123 @@
 }
 
+my $num_jobs = 0;
 foreach my $row (@$rows) {
     my $rownum   = $row->{ROWNUM};
@@ -131 +132 @@
     my $id       = $row->{ID};
     my $class_id = $row->{CLASS_ID};
-    my $stamp_name   = $row->{STAMP_NAME};
     my $filter   = $row->{REQFILT};
     my $mjd_min = $row->{MJD_MIN};
@@ -142 +142 @@
     my $option_mask= $row->{OPTION_MASK};
 
-    $stamp_name = "" if $stamp_name eq "null";
     $class_id = "" if ($class_id eq "null" or $class_id eq "all");
     
@@ -193 +192 @@
 
     if (!$images) {
-        print STDERR "no matching images found\n";
-        exit $PS_EXIT_DATA_ERROR;
+        print STDERR "no matching images found for row $rownum\n";
+        next;
     }
     if ($mode eq "list_uri") {
@@ -223 +222 @@
         }
         close LISTFILE;
+        $num_jobs++;
         my $command = "$pstamptool -addjob -req_id $req_id -job_type get_image"
                     . " -uri $listfile -outputBase $out_dir -rownum $rownum";
@@ -255 +255 @@
             my $output_base = "$out_dir/${rownum}_${job_num}";
 
-            # By commenting out the next line, I hereby drop the use of STAMP_NAME
-            # $output_base .= "_${stamp_name}" if $stamp_name;
-
             # add astrometry file for raw and chip images if one is available
             if (($img_type eq "chip") || ($img_type eq "raw")) {
@@ -281 +278 @@
             my $state = "run";
 
+            $num_jobs++;
             my $command = "$pstamptool -addjob -req_id $req_id -job_type $job_type"
                 . " -uri $uri -outputBase $output_base -args '$args' -rownum $rownum"
@@ -307 +305 @@
 }
 
-exit 0;
+if ($mode eq "queue_jobs") {
+    if ($num_jobs) {
+        exit 0;
+    } else {
+        # no jobs queued return error to get the request stopped
+        # TODO: need to define meaningful error codes
+        exit $PS_EXIT_UNKNOWN_ERROR;
+    }
+} else {
+    exit 0;
+}