Changeset 6458

Timestamp:

May 19, 2014, 9:08:39 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1807: FlatFileParser? should check section header regexp before ignore regexp in hasMoreData method

File:

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

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

@@ -1093 +1093 @@
     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>Does it match the {@link #setIgnoreRegexp(Pattern) ignore} regular
+      expression?</li>
     <li>Can it be split by the {@link #setDataSplitterRegexp(Pattern) data}
       regular expression into the appropriate number of columns?</li>
     </ol>
-    If the first check is true, TRUE is returned and the data may be
-    retrieved with the {@link #nextData() nextData} method. If the
-    second check is true, FALSE is returned and no more data may be
-    retrieved. If the third check is true, FALSE is returnd and no 
-    more data may be retrived but the section may be retrived with 
-    the {@link #nextSection() nextSection} method. If neither one is 
-    true, the processing continues with the next line until the end 
-    of file is reached.
+    If the first or second check is true, FALSE is returned no more data may be
+    retrieved, but a section may be retrived with the {@link #nextSection() nextSection} 
+    method. If the third check is true, the line is ignored and the processing
+    continues with the next line. If the fourth check is true, TRUE is 
+    returned and the data may be retrieved with the {@link #nextData() nextData} method.
 
     @return TRUE if there is more data, FALSE otherwise
@@ -1141 +1138 @@
           parsedDataLines++;
           parsedCharacters += line.length(); 
-          
-          // Check if it is a comment line
-          if (!done && ignore != null)
-          {
-            Matcher m = ignore.matcher(line);
-            if (m.matches()) 
-            {
-              ignoredLines++;
-              if (keepSkippedLines) skippedLines.add(new Line(parsedLines, line, LineType.IGNORED));
-              
-              // Skip to next line
-              /* #### CONTINUE-STATEMENT #### */
-              continue;
-            }
-          }
 
           // Check if it matches the data footer regexp
@@ -1176 +1158 @@
             }
           }
-          
+        
+          // Check if it is a comment line
+          if (!done && ignore != null)
+          {
+            Matcher m = ignore.matcher(line);
+            if (m.matches()) 
+            {
+              ignoredLines++;
+              if (keepSkippedLines) skippedLines.add(new Line(parsedLines, line, LineType.IGNORED));
+              
+              // Skip to next line
+              /* #### CONTINUE-STATEMENT #### */
+              continue;
+            }
+          }
+
           if (!done)
           {