Changeset 31509

Timestamp:

May 10, 2011, 11:05:55 AM (15 years ago)

Author:

bills

Message:

integrate a couple of changes from the trunk

Location:

tags/ipp-20110505/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_job_run.pl (modified) (1 diff)
• pstampparse.pl (modified) (1 diff)

tags/ipp-20110505/pstamp/scripts/pstamp_job_run.pl

@@ -146 +146 @@
             # user required uncensored but since stage isn't chip we can't rebuild them
             my_die("uncensored inputs not available for job $job_id", $job_id, $PSTAMP_NOT_AVAILABLE, 'stop');
-        } elsif (($options & $PSTAMP_REQUEST_UNCENSORED) and ($params->{state} eq 'update') and ($stage ne 'chip')) {
+        } elsif (($options & $PSTAMP_REQUEST_UNCENSORED) and ($params->{state} ne 'full') and ($stage ne 'chip')) {
             # we can only restore pixels for chip stage images if the data has been updated.
-            # XXX: this test is not quite good enough. If all components have been updated then the
-            # state will be 'full' But this will get us going.
-            print "Run state is update: will make stamps from destreaked $stage images.\n";
+            # the data will have been updated if the params->{state} the state when the job was queued is not 'full' (
+            # XXX: we should probably be looking explicitly at the job and checking for a dep_id
+            print "Run state was $params->{state}: will make stamps from destreaked $stage images.\n";
             # make stamps from uncensored images
             $muggle = 0;

tags/ipp-20110505/pstamp/scripts/pstampparse.pl

@@ -754 +754 @@
     if ( $num_jobs == 0 ) {
         print STDERR "no jobs for row $rownum\n" if $verbose;
-        insertFakeJobForRow($row, 1, $PSTAMP_NO_JOBS_QUEUED);
+        insertFakeJobForRow($row, 1, $PSTAMP_NO_IMAGE_MATCH);
         $num_jobs = 1;
+        $row->{job_num} = 1;
     }
     return $num_jobs;