Changeset 27783

Timestamp:

Apr 27, 2010, 11:37:45 AM (16 years ago)

Author:

bills

Message:

make default for requests to be wait for cleaned up inputs to be updated

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (3 diffs)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (2 diffs)
• pstamp/scripts/pstampparse.pl (modified) (2 diffs)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -32 +32 @@
 use POSIX;
 
+my $dvo_verbose = 0;
 my $save_temps = 0;
 
@@ -693 +694 @@
         my $command = "$dvoImagesAtCoords -astrom $astrom_resolved $ra $dec";
         # run the tool and parse the output
-        my $dvo_verbose = 0;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                     run(command => $command, verbose => $dvo_verbose);
@@ -1073 +1073 @@
             }
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                 run(command => $command, verbose => $verbose);
+                 run(command => $command, verbose => $dvo_verbose);
             unless ($success) {
                 # don't fail if the program exited normally and exit status was PSTAMP_NO_OVERLAP

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -29 +29 @@
                     $PSTAMP_SELECT_UNCONV
                     $PSTAMP_USE_IMFILE_ID
-                    $PSTAMP_WAIT_FOR_UPDATE
+                    $PSTAMP_NO_WAIT_FOR_UPDATE
                     $PSTAMP_SUCCESS
                     $PSTAMP_SYSTEM_ERROR
@@ -63 +63 @@
 our $PSTAMP_USE_IMFILE_ID    = 16384;
 
-our $PSTAMP_WAIT_FOR_UPDATE  = 32768;
+our $PSTAMP_NO_WAIT_FOR_UPDATE  = 32768;
 
 # job and result codes

trunk/pstamp/scripts/pstampparse.pl

@@ -558 +558 @@
             }
             if (!$fault) {
-                # don't wait for update unless the caller asks us to
-                if (!($option_mask & $PSTAMP_WAIT_FOR_UPDATE)) {
+                # wait for update unless the customer asks us not to
+                if (($option_mask & $PSTAMP_NO_WAIT_FOR_UPDATE)) {
                     $newState = 'stop';
                     $fault = $PSTAMP_NOT_AVAILABLE;
@@ -724 +724 @@
                 $fault = $PSTAMP_GONE;
             } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0))) {
-                # don't wait for update unless the caller asks us to
-                if (!($option_mask & $PSTAMP_WAIT_FOR_UPDATE)) {
+                # wait for update unless the customer asks us to not to
+                if ($option_mask & $PSTAMP_NO_WAIT_FOR_UPDATE) {
                     $newState = 'stop';
                     $fault = $PSTAMP_NOT_AVAILABLE;