Changeset 27260 for trunk

Timestamp:

Mar 12, 2010, 8:54:56 AM (16 years ago)

Author:

bills

Message:

handle case where request file has no rows

Location:

trunk

Files:

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

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

@@ -141 +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";
+        }
     }
 

trunk/pstamp/scripts/pstampparse.pl

@@ -151 +151 @@
         print STDERR @$stderr_buf;
     }
-    my $table =  $mdcParser->parse(join "", @$stdout_buf) or
-        my_die("Unable to parse metdata config doc", $PS_EXIT_UNKNOWN_ERROR);
-
-    $rows = parse_md_list($table);
+    if (@$stdout_buf) {
+        my $table =  $mdcParser->parse(join "", @$stdout_buf) or
+            my_die("Unable to parse metdata config doc", $PS_EXIT_UNKNOWN_ERROR);
+        $rows = parse_md_list($table);
+    }
+
 }
 
@@ -305 +307 @@
 }
 
-if (($mode eq "queue_jobs") and ($num_jobs eq 0)) {
+if (($mode eq "queue_job") and ($num_jobs eq 0)) {
     print STDERR "no jobs created for $req_name\n" if $verbose;
-    insertFakeJobForRow(undef, 0, $PSTAMP_UNKNOWN_ERROR);
+    insertFakeJobForRow(undef, 0, $PSTAMP_INVALID_REQUEST);
 }