Changeset 28003 for branches/pap/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

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

branches/pap/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
@@ -145 +145 @@
         }
         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_fast($mdcParser, join "", @$stdout_buf);
         } else {
             print STDERR "$request_file_name contains empty request table\n";
@@ -180 +177 @@
     return (\%header, \%req_specs);
 }
+
+sub parse_md_fast {
+    my $mdcParser = shift;
+    my $input = shift;
+    my $output = ();
+
+    my @whole = split /\n/, $input;
+    my @single = ();
+
+    my $n;
+    while ( ($n = @whole) > 0) {
+        my $value = shift @whole;
+        push @single, $value;
+        if ($value =~ /^\s*END\s*$/) {
+            push @single, "\n";
+
+            my $list = parse_md_list( $mdcParser->parse( join("\n", @single ) ) ) or
+                print STDERR "Unable to parse metdata config doc" and return undef;
+#            my $num = @$list;
+#            print STDERR "list has $num elments\n";
+            push @$output, $list->[0];
+
+            @single = ();
+        }
+    }
+    return $output;
+}
+
 1;