Changeset 27517 for branches/eam_branches/20100225/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/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
@@ -26 +27 @@
                     $PSTAMP_SELECT_BACKMDL
                     $PSTAMP_SELECT_INVERSE
+                    $PSTAMP_SELECT_UNCONV
                     $PSTAMP_WAIT_FOR_UPDATE
                     $PSTAMP_SUCCESS
@@ -50 +52 @@
 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;
@@ -55 +58 @@
 our $PSTAMP_SELECT_BACKMDL   = 32;
 our $PSTAMP_SELECT_INVERSE   = 1024;
+our $PSTAMP_SELECT_UNCONV    = 2048;
 
-our $PSTAMP_WAIT_FOR_UPDATE  = 2048;
+our $PSTAMP_WAIT_FOR_UPDATE  = 32768;
 
 # job and result codes
@@ -137 +141 @@
             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";
+        }
     }