Changeset 33670 for trunk/pstamp/scripts

Timestamp:

Apr 3, 2012, 4:07:34 PM (14 years ago)

Author:

bills

Message:

Minor postage stamp changes that have been running in production for awhile now

Location:

trunk/pstamp/scripts

Files:

• pstamp_finish.pl (modified) (1 diff)
• pstampparse.pl (modified) (1 diff)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -201 +201 @@
                 # process the reglist file to get the list of files produced by this job
                 foreach my $line (<JRL>) {
+
+                    # XXX: we are getting many cases where the size and/or md5sum calculated by
+                    # the job has changed by the time the request_finish has run
+                    # Don't
                     # add line to the requests's reglist
-                    print $rlf $line;
+                    # ....
+#                    print $rlf $line;
+
 
                     chomp $line;
-                    my ($img_name, undef) = split '\|', $line;
+                    my ($img_name, $reported_size, $reported_sum, $filetype) = split '\|', $line;
+                    # ... instead let dsreg compute the paramters by leaving them blank
+                    print $rlf "$img_name|||$filetype|\n";
 
                     # add line to the table definition file

trunk/pstamp/scripts/pstampparse.pl

@@ -333 +333 @@
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
 
-    if (!$skycenter and !$component and $stage ne 'stack' and !($option_mask & $PSTAMP_USE_IMFILE_ID)){
+    my $wholefile = 0;
+    if (!$skycenter && $row->{CENTER_X} == 0 && $row->{CENTER_Y} == 0) {
+        # Secret code for returning the whole file
+        $wholefile = 1;
+    }
+
+    if (!$skycenter and !$wholefile and !$component and $stage ne 'stack' and !($option_mask & $PSTAMP_USE_IMFILE_ID)){
         print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);