Changeset 31508

Timestamp:

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

Author:

bills

Message:

fix logic error. We can't produce uncensored stamps when updating except for chip stage.
Change test to state ne 'full' instead of state eq 'update'. state is likely to be 'cleaned'
(This fix was in the ipp-20110406 production build but never committed

File:

• trunk/pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)

trunk/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;