Changeset 27840 for branches/simtest_nebulous_branches/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (3 diffs)

branches/simtest_nebulous_branches/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -21 +21 @@
                     $PSTAMP_SELECT_IMAGE
                     $PSTAMP_SELECT_MASK
+                    $PSTAMP_SELECT_VARIANCE
                     $PSTAMP_SELECT_WEIGHT
+                    $PSTAMP_SELECT_CMF
+                    $PSTAMP_SELECT_PSF
+                    $PSTAMP_SELECT_BACKMDL
+                    $PSTAMP_SELECT_INVERSE
+                    $PSTAMP_SELECT_UNCONV
+                    $PSTAMP_USE_IMFILE_ID
+                    $PSTAMP_NO_WAIT_FOR_UPDATE
+                    $PSTAMP_SUCCESS
+                    $PSTAMP_SYSTEM_ERROR
+                    $PSTAMP_NOT_IMPLEMENTED
+                    $PSTAMP_UNKNOWN_ERROR
+                    $PSTAMP_DUP_REQUEST
+                    $PSTAMP_INVALID_REQUEST
+                    $PSTAMP_UNKNOWN_PRODUCT
+                    $PSTAMP_NO_IMAGE_MATCH
+                    $PSTAMP_NOT_DESTREAKED
+                    $PSTAMP_NOT_AVAILABLE
+                    $PSTAMP_GONE
+                    $PSTAMP_NO_JOBS_QUEUED
+                    $PSTAMP_NO_OVERLAP
                     );
 our %EXPORT_TAGS = (standard => [@EXPORT_OK]);
@@ -32 +53 @@
 our $PSTAMP_SELECT_IMAGE     = 1;
 our $PSTAMP_SELECT_MASK      = 2;
+our $PSTAMP_SELECT_VARIANCE  = 4;
 our $PSTAMP_SELECT_WEIGHT    = 4;
+our $PSTAMP_SELECT_CMF       = 8;
+our $PSTAMP_SELECT_PSF       = 16;
+our $PSTAMP_SELECT_BACKMDL   = 32;
+our $PSTAMP_SELECT_INVERSE   = 1024;
+our $PSTAMP_SELECT_UNCONV    = 2048;
+
+our $PSTAMP_USE_IMFILE_ID    = 16384;
+
+our $PSTAMP_NO_WAIT_FOR_UPDATE  = 32768;
+
+# job and result codes
+# NOTE: these must match the values in pstamp/src/pstamp.h
+our $PSTAMP_SUCCESS          = 0;
+our $PSTAMP_SYSTEM_ERROR     = 10;
+our $PSTAMP_NOT_IMPLEMENTED  = 11;
+our $PSTAMP_UNKNOWN_ERROR    = 12;
+
+our $PSTAMP_DUP_REQUEST      = 20;
+our $PSTAMP_INVALID_REQUEST  = 21;
+our $PSTAMP_UNKNOWN_PRODUCT  = 22;
+our $PSTAMP_NO_IMAGE_MATCH   = 23;
+our $PSTAMP_NOT_DESTREAKED   = 24;
+our $PSTAMP_NOT_AVAILABLE    = 25;
+our $PSTAMP_GONE             = 26;
+our $PSTAMP_NO_JOBS_QUEUED   = 27;
+our $PSTAMP_NO_OVERLAP       = 28;
 
 use IPC::Cmd 0.36 qw( can_run run );
@@ -96 +144 @@
             print STDERR @$stderr_buf;
         }
-        my $table =  $mdcParser->parse(join "", @$stdout_buf) or
-            die("Unable to parse metdata config doc");
+        if (@$stdout_buf) {
+            my $table =  $mdcParser->parse(join "", @$stdout_buf) or
+                die("Unable to parse metdata config doc");
 
-        $rows = parse_md_list($table);
+            $rows = parse_md_list($table);
+        } else {
+            print STDERR "$request_file_name contains empty request table\n";
+        }
     }