Changeset 29129 for trunk/pstamp/scripts/detect_query_create

Timestamp:

Sep 8, 2010, 3:42:56 PM (16 years ago)

Author:

watersc1

Message:

Fix parsing to correctly handle extra comments and blank lines. This ensures that the example text parses correctly (which you'd think I'd have checked before).

File:

• trunk/pstamp/scripts/detect_query_create (modified) (4 diffs)

trunk/pstamp/scripts/detect_query_create

@@ -307 +307 @@
     while (<$in>) {
         chomp;
+#       print STDERR "$line_num $#keywords $_\n";
+        if ($_ =~ /^\s*$/) {
+            next;
+        }
         if ($line_num == 0) {
+            if ($_ !~ /EXTVER/) {
+                next;
+            }
             # Parse header information keywords
             $_ =~ s/#//g;
@@ -319 +326 @@
             my @values = split /\s+/;
             if ($#values != $#keywords) {
-                die "Number of header columns in input does not equal expected number of header words";
+                die "Number of header columns in input does not equal expected number of header words $#values $#keywords";
             }
             for (my $i = 0; $i <= $#values; $i++) {
@@ -326 +333 @@
         }
         elsif ($line_num == 2) {
+            if ($_ !~ /ROWNUM/) {
+                next;
+            }
             # Parse table information keywords, dumping old keywords
             $_ =~ s/#//g;
@@ -338 +348 @@
                 my @values = split /\s+/;
                 if ($#values != $#keywords) {
-                    die "Number of header columns in input does not equal expected number of header words";
+                    die "Number of header columns in input does not equal expected number of header words $#values $#keywords";
                 }
                 for (my $i = 0; $i <= $#values; $i++) {