Changeset 25158 for branches/czw_branch/cleanup/pstamp/scripts/pstamp_finish.pl

Timestamp:

Aug 20, 2009, 12:42:13 PM (17 years ago)

Author:

watersc1

Message:

More merging

Location:

branches/czw_branch/cleanup

Files:

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

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

@@ -94 +94 @@
         if (!mkdir $out_dir) {
             print STDERR "cannot create output directory $out_dir";
-            stop_request_and_exit($req_id, $PS_EXIT_UNKNOWN_ERROR);
+            stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR);
         }
 
@@ -102 +102 @@
         # request
         print STDERR "output directory $out_dir exists but is not a directory";
-        stop_request_and_exit($req_id, $PS_EXIT_UNKNOWN_ERROR);
+        stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR);
     }
 
     if (! -e $req_file ) {
         print STDERR "request file $req_file is missing\n";
-        stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
+        stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
     }
 
@@ -117 +117 @@
         # point 
         print STDERR "failed to read request_file $req_file" ;
-        stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
+        stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
     }
 
@@ -154 +154 @@
                 print STDERR "Request $req_id produced no jobs.\n"
             }
-            # This should not happen. A fake job should be queued
-            stop_request_and_exit($req_id, $PS_EXIT_PROG_ERROR);
+            # No Jobs. 
+            # XXXX Ouch. We need results for each rownum (each request specification) in the request file 
+            # including those that produced no jobs.
+            # for now add an entry for rownum 1 and a phony error code.
+            # we've included parse_error.txt to the fileset if it exists
+            #
+            my $rownum = 0;
+            my $fault = 42; # get a real error code
+            print $tdf "$rownum|$fault|0|0|";
+            print $tdf "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|\n";
         } else {
             my $metadata = $mdcParser->parse($output) or die("Unable to parse metdata config doc");
@@ -174 +182 @@
         my $exp_id = $job->{exp_id};
 
-        if ($fault eq $PSTAMP_DUP_REQUEST) {
-            # this request had a duplicate request name. We can't put the results
-            # on the data store since the product name is already used
-            # maybe we could be more clever about this and choose a fileset name
-            stop_request_and_exit($req_id, $fault);
-        }
-
         my ($row, $req_info, $project) = get_request_info($rows, $rownum);
 
@@ -188 +189 @@
             carp("failed to find imagedb for project: $project");
             if (!$fault) {
-                stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
+                stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
             }
         }
@@ -279 +280 @@
 }
 
-sub stop_request_and_exit {
+sub stop_request {
     my $req_id = shift;
     my $fault  = shift;