Changeset 25406 for branches/eam_branches/20090715/pstamp/scripts/pstamp_finish.pl

Timestamp:

Sep 15, 2009, 4:02:42 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20090715/pstamp/scripts/pstamp_finish.pl (modified) (14 diffs)

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

@@ -8 +8 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+use Carp;
 
 use Time::Local;
@@ -47 +48 @@
 
 my $ipprc = PS::IPP::Config->new(); # IPP Configuration
-
 if ($redirect_output) {
     my $logDest = "$out_dir/psfinish.$req_id.log";
@@ -68 +68 @@
 }
 
+if ($product eq "NULL") {
+    stop_request_and_exit($req_id, $PS_EXIT_PROG_ERROR);
+}
 
 my $outputDataStoreRoot = metadataLookupStr($ipprc->{_siteConfig}, 'DATA_STORE_ROOT');
@@ -94 +97 @@
         if (!mkdir $out_dir) {
             print STDERR "cannot create output directory $out_dir";
-            stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR);
+            stop_request_and_exit($req_id, $PS_EXIT_UNKNOWN_ERROR);
         }
 
@@ -102 +105 @@
         # request
         print STDERR "output directory $out_dir exists but is not a directory";
-        stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR);
+        stop_request_and_exit($req_id, $PS_EXIT_UNKNOWN_ERROR);
     }
 
     if (! -e $req_file ) {
         print STDERR "request file $req_file is missing\n";
-        stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
+        stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
     }
 
@@ -117 +120 @@
         # point 
         print STDERR "failed to read request_file $req_file" ;
-        stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
+        stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
     }
 
@@ -154 +157 @@
                 print STDERR "Request $req_id produced no jobs.\n"
             }
-            # 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";
+            # This should not happen. A fake job should be queued
+            stop_request_and_exit($req_id, $PS_EXIT_PROG_ERROR);
         } else {
             my $metadata = $mdcParser->parse($output) or die("Unable to parse metdata config doc");
@@ -182 +177 @@
         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 +190 @@
         if (!$image_db) {
             carp("failed to find imagedb for project: $project");
-            stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
+            if (!$fault) {
+                stop_request_and_exit($req_id, $PS_EXIT_CONFIG_ERROR);
+            }
         }
 
@@ -227 +231 @@
                 print $tdf "$exp_info|";
                 print $tdf "$req_info|";
+                print $tdf "\n";
             }
         } else {
@@ -251 +256 @@
         # register the fileset
         my $command = "$dsreg --list $reglist_name --add $fileset --product $product --type PSRESULTS";
-        $command .= " --link --datapath $out_dir";
+        $command .= " --link --datapath $out_dir --ps0 $req_id";
         $command .= " --dbname $dbname" if $dbname;
 
@@ -277 +282 @@
 }
 
-sub stop_request {
+sub stop_request_and_exit {
     my $req_id = shift;
     my $fault  = shift;
@@ -299 +304 @@
     my $row = $rows->{$rownum};
 
+    # these may be set to null during processing
+    my $component = $row->{COMPONENT};
+    $component = "null" if !$component;
+    my $tess_id = $row->{TESS_ID};
+    $tess_id = "null" if !$tess_id;
+
     # This is ugly, error prone and hard to change.
     # Create a results file module and provide a list of the names (we have the data in the columns)
     my $rowinfo = "$row->{PROJECT}|$row->{JOB_TYPE}|$row->{REQ_TYPE}|$row->{IMG_TYPE}|";
-    $rowinfo   .= "$row->{ID}|$row->{TESS_ID}|$row->{COMPONENT}|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
+    $rowinfo   .= "$row->{ID}|$tess_id|$component|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
     $rowinfo   .= "$row->{REQFILT}|$row->{COORD_MASK}|$row->{CENTER_X}|$row->{CENTER_Y}|";
     $rowinfo   .= "$row->{WIDTH}|$row->{HEIGHT}";
@@ -313 +324 @@
     my $exp_id = shift;
 
-    if (!$exp_id) {
+    if (!$exp_id or !$image_db) {
         # no exposure id just return zeros
         # XXX: we could put a value in for filter, but we don't have a good place to find it