Changeset 4056

Timestamp:

Dec 12, 2007, 9:35:46 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #873: AbstractFlatFileImporter? should use number of parsed bytes for progress reporting

Location:

branches/2.5-stable/src

Files:

• core/net/sf/basedb/util/parser/FlatFileParser.java (modified) (4 diffs)
• plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java (modified) (5 diffs)

branches/2.5-stable/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -47 +47 @@
 import net.sf.basedb.core.BaseException;
 import net.sf.basedb.core.Config;
+import net.sf.basedb.util.InputStreamTracker;
 
 /**
@@ -176 +177 @@
 
   /**
+    For keeping track of the number of bytes parsed.
+  */
+  private InputStreamTracker tracker;
+  
+  /**
     The regular expression for matching a header line.
   */
@@ -522 +528 @@
   {
     Charset cs = Charset.forName(charsetName == null ? Config.getCharset() : charsetName);
-    this.reader = new BufferedReader(new InputStreamReader(in, cs));
+    this.tracker = new InputStreamTracker(in);
+    this.reader = new BufferedReader(new InputStreamReader(tracker, cs));
   }
 
@@ -1116 +1123 @@
     correspond to the number of parsed bytes depending on the character
     set of the file.
+    @see #getParsedBytes()
   */
   public long getParsedCharacters()
   {
     return parsedCharacters;
+  }
+  
+  /**
+    Get the number of parsed bytes so far. This value may or may not
+    correspond to the number of parsed characters depending on the character
+    set of the file.
+    @since 2.5.1
+    @see #getParsedCharacters()
+  */
+  public long getParsedBytes()
+  {
+    return tracker == null ? 0 : tracker.getNumRead();
   }
   

branches/2.5-stable/src/plugins/core/net/sf/basedb/plugins/AbstractFlatFileImporter.java

@@ -536 +536 @@
         if (section != null && section.type() == FlatFileParser.LineType.SECTION)
         {
-          if (progress != null) progress.display(getProgress(ffp.getParsedCharacters()), "Parsing section "+section.name()+"...");
+          if (progress != null) progress.display(getProgress(ffp), "Parsing section "+section.name()+"...");
           try
           {
@@ -565 +565 @@
         else
         {
-          if (progress != null) progress.display(getProgress(ffp.getParsedCharacters()), "Parsing headers...");
+          if (progress != null) progress.display(getProgress(ffp), "Parsing headers...");
         }
         FlatFileParser.LineType result = ffp.parseHeaders();
@@ -603 +603 @@
             " on line " + (line == null ? "-1" : line.lineNo() + ": " + StringUtil.trimString(line.line(), 20)), t);      
         }
-        if (progress != null) progress.display(getProgress(ffp.getParsedCharacters()), "Parsing data...");
+        if (progress != null) progress.display(getProgress(ffp), "Parsing data...");
         int progressLine = 0;
         
@@ -634 +634 @@
               if (progress != null)
               {
-                progress.display(getProgress(ffp.getParsedCharacters()), "Parsing data... (" + ffp.getParsedLines() + " lines so far)");
+                progress.display(getProgress(ffp), "Parsing data... (" + ffp.getParsedLines() + " lines so far)");
               }
             }
@@ -662 +662 @@
   // -------------------------------------------
 
-  private int getProgress(long parsedCharacters)
-  {
-    return (int) (100 * parsedCharacters / fileSize);
+  private int getProgress(FlatFileParser ffp)
+  {
+    return (int) (100 * ffp.getParsedBytes() / fileSize);
   }