Changeset 25158 for branches/czw_branch/cleanup/pstamp/scripts/pstampparse.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/pstampparse.pl (modified) (8 diffs)

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

@@ -14 +14 @@
 use PS::IPP::PStamp::Job qw( :standard );
 use File::Temp qw(tempfile);
-use Carp;
 
 my $verbose;
@@ -97 +96 @@
 my_die("wrong EXTVER $extver found in $request_file_name", $PS_EXIT_PROG_ERROR) if ($extver ne "1");
 
-# check for duplicate request name
-if (!$no_update) {
+{
     my $command = "$pstamptool -listreq  -name $req_name";
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
-    # no verbose so that error message about request not found doesn't appear in parse_error.txt
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 0);
+        run(command => $command, verbose => $verbose);
     my $exitStatus = $error_code >> 8;
     if ($success) {
@@ -186 +183 @@
 
     my $option_mask= $row->{OPTION_MASK};
-    my $inverse = ($option_mask & $PSTAMP_SELECT_INVERSE) ? 1 : 0;
-    $row->{inverse} = $inverse;
 
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
@@ -252 +247 @@
         next;
     } else {
-        # Call PS::IPP::PStamp::Job locate_images subroutine to get the images for this
+        # Call PS::IPP::PStamp::Job's locate_images subroutine to get the parameters for this
         # request specification. An array reference is returned.
         my ($x, $y);
-
         $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $search_component,
-                $inverse, $skycenter, $x, $y, $mjd_min, $mjd_max, $filter, $verbose);
-
+                $skycenter, $x, $y, $mjd_min, $mjd_max, $filter, $verbose);
         if (!$imageList or !@$imageList) {
             print STDERR "no matching images found for row $rownum\n" if $verbose;
@@ -289 +282 @@
     my $have_skycells = shift;
     my $need_magic = shift;
-    my $num_jobs = 0;
 
     my $rownum = $row->{ROWNUM};
 
     my $components = $row->{components};
+    my $numComponents = scalar keys %$components;
+    if ( $numComponents == 0 ) {
+        print STDERR "no jobs for row $rownum\n" if $verbose;
+        insertFakeJobForRow($row, 1, $PSTAMP_NO_JOBS_QUEUED);
+        return 1;
+    }
 
     my $roi_string;
@@ -374 +372 @@
         my $fault = 0;
 
-        if (($stage ne 'stack') and ($stage ne 'raw')) {
-            if (($image->{state} eq 'goto_purged') or ($image->{data_state} eq 'purged')) {
-                $newState = 'stop';
-                $fault = $PSTAMP_GONE;
-            } elsif (($image->{data_state} ne 'full') or ($image->{state} ne 'full' )) {
-                # XXX here is where we need to queue an update job
-                # for now just say that the image is not available
-                $newState = 'stop';
-                $fault = $PSTAMP_NOT_AVAILABLE;
-            }
-        }
+if (0) {
+        # XXX this doesn't work because not all ippTools outputs include data_state
+        # fix chipTool also need to not make this test for raw stage
+        if ((($stage ne 'stack') and ($image->{data_state} ne 'full')) or $image->{state} ne 'full' ){
+            # XXX here is where we need to queue an update job
+            # for now just say that the image is not available
+            $newState = 'stop';
+            $fault = 49;
+        }
+}
 
         $num_jobs++;
@@ -412 +409 @@
             print "skipping command: $command\n";
         }
-    }
-    if ( $num_jobs == 0 ) {
-        print STDERR "no jobs for row $rownum\n" if $verbose;
-        insertFakeJobForRow($row, 1, $PSTAMP_NO_OVERLAP);
-        $num_jobs = 1;
     }
     return $num_jobs;
@@ -624 +616 @@
     return 0 if ($r1->{IMG_TYPE} ne $r2->{IMG_TYPE});
     return 0 if ($r1->{ID} ne $r2->{ID});
-    return 0 if ($r1->{inverse} ne $r2->{inverse});
 
     if (defined($r1->{COMPONENT})) {