Changeset 4102

Timestamp:

Jan 28, 2008, 11:07:20 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #905: AbstractFlatFileParser? aborts parsing if a parseHeaders() doesn't find any data

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java (modified) (2 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java

@@ -576 +576 @@
         }
         FlatFileParser.LineType result = ffp.parseHeaders();
-        if (result == FlatFileParser.LineType.UNKNOWN) return;
         FlatFileParser.Line line = null;
         try
@@ -611 +610 @@
             " on line " + (line == null ? "-1" : line.lineNo() + ": " + StringUtil.trimString(line.line(), 20)), t);      
         }
-        if (progress != null) progress.display(getProgress(ffp), "Parsing data...");
-        int progressLine = 0;
-        
-        beginData();
-        try
+        if (result == FlatFileParser.LineType.DATA || result == FlatFileParser.LineType.DATA_HEADER)
         {
-          while (ffp.hasMoreData())
+          if (progress != null) progress.display(getProgress(ffp), "Parsing data...");
+          int progressLine = 0;
+          
+          beginData();
+          try
           {
-            dataline = ffp.nextData();
-            try
+            while (ffp.hasMoreData())
             {
-              handleData(dataline);
+              dataline = ffp.nextData();
+              try
+              {
+                handleData(dataline);
+              }
+              catch (Throwable t)
+              {
+                if (errorHandler == null)
+                {
+                  throw t;
+                }
+                else
+                {
+                  errorHandler.handleError(t);
+                }
+                skippedLines++;
+              }
+              progressLine++;
+              if (progressLine == 100)
+              {
+                progressLine = 0;
+                if (progress != null)
+                {
+                  progress.display(getProgress(ffp), "Parsing data... (" + ffp.getParsedLines() + " lines so far)");
+                }
+              }
+              // In case the server is shutting down... throw exception, rollback and quit
+              if (Thread.interrupted()) throw new SignalException("Aborted by user.");
             }
-            catch (Throwable t)
-            {
-              if (errorHandler == null)
-              {
-                throw t;
-              }
-              else
-              {
-                errorHandler.handleError(t);
-              }
-              skippedLines++;
-            }
-            progressLine++;
-            if (progressLine == 100)
-            {
-              progressLine = 0;
-              if (progress != null)
-              {
-                progress.display(getProgress(ffp), "Parsing data... (" + ffp.getParsedLines() + " lines so far)");
-              }
-            }
-            // In case the server is shutting down... throw exception, rollback and quit
-            if (Thread.interrupted()) throw new SignalException("Aborted by user.");
           }
-        }
-        catch (Throwable t)
-        {
-          throw new BaseException(t.getMessage() + 
-            " on line " + (dataline == null ? "-1" : dataline.lineNo() + ": " + StringUtil.trimString(dataline.line(), 20)), t);
+          catch (Throwable t)
+          {
+            throw new BaseException(t.getMessage() + 
+              " on line " + (dataline == null ? "-1" : dataline.lineNo() + ": " + StringUtil.trimString(dataline.line(), 20)), t);
+          }
         }
       }