Changeset 3416

Timestamp:

May 31, 2007, 10:48:52 AM (16 years ago)

Author:

Johan Enell

Message:

changed the regexp order in hasMoreData()

File:

• trunk/src/core/net/sf/basedb/util/parser/FlatFileParser.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -882 +882 @@
     lines from the stream. Each line is checked in the following order:
     <ol>
+    <li>Does it match the {@link #setIgnoreRegexp(Pattern) ignore} regular
+      expression?</li>
+    <li>Does it match the {@link #setDataFooterRegexp(Pattern) data footer}
+      regular expression?</li>
+    <li>Does it match the {@link #setSectionRegexp(Pattern) section}
+      regular expression?</li>
     <li>Can it be split by the {@link #setDataSplitterRegexp(Pattern) data}
-      regular expression into the appropriate number of columns?
-    <li>Does it match the {@link #setDataFooterRegexp(Pattern) data footer}
-      regular expression?
-    <li>Does it match the {@link #setSectionRegexp(Pattern) section}
-      regular expression?
+      regular expression into the appropriate number of columns?</li>
     </ol>
     If the first check is true, TRUE is returned and the data may be
@@ -937 +939 @@
             }
           }
+
+          // Check if it matches the data footer regexp
+          if (!done && dataFooter != null)
+          {
+            Matcher m = dataFooter.matcher(line);
+            done = m.matches();
+          }
+          
+          // Check if it matches the section regexp
+          if (!done && section != null)
+          {
+            Matcher m = section.matcher(line);
+            if (m.matches() && (m.groupCount() == 1))
+            {
+              done = true;
+              nextSection = new Line(parsedLines, line, m.group(1), LineType.SECTION);
+              lines.add(nextSection);
+            }
+          }
           
           if (!done)
@@ -947 +968 @@
               done = true;
               nextData = new Data(parsedLines, line, columns, emptyIsNull, nullIsNull);
-            }
-          }
-
-          // Check if it matches the data footer regexp
-          if (!done && (dataFooter != null))
-          {
-            Matcher m = dataFooter.matcher(line);
-            done = m.matches();
-          }
-          
-          // Check if it matches the section regexp
-          if (!done && (section != null))
-          {
-            Matcher m = section.matcher(line);
-            if (m.matches() && (m.groupCount() == 1))
-            {
-              done = true;
-              nextSection = new Line(parsedLines, line, m.group(1), LineType.SECTION);
-              lines.add(nextSection);
             }
           }