X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FAbstractWiktionaryParser.java;h=8d03bff4c004418df51fd0a8a63d86399d9ac6be;hb=750d808c256f16703f8b348df2d260c5ca0bd56d;hp=4f5d3625735747b31a10ad3e50e7804b2cda2e24;hpb=7d5ada9329d101b59b55691dd2f63ce3e3860011;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java
index 4f5d362..8d03bff 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java
@@ -48,7 +48,7 @@ public abstract class AbstractWiktionaryParser implements Parser {
   final Set<String> pairsAdded = new LinkedHashSet<String>();
   
   EntrySource entrySource;
-  String title;
+  public String title;
 
 
   abstract void parseSection(final String heading, final String text);
@@ -87,6 +87,7 @@ public abstract class AbstractWiktionaryParser implements Parser {
       }
     }
     } finally {
+      dis.close();
       LOG.info("***COUNTERS***");
       for (final Map.Entry<String, AtomicInteger> entry : counters.entrySet()) {
         LOG.info(entry.getKey() + ": " + entry.getValue());
@@ -151,8 +152,10 @@ public abstract class AbstractWiktionaryParser implements Parser {
       this.entryTypeName = oldEntryTypeName;
     }
     
-    public void dispatch(final String wikiText, final EntryTypeName entryTypeName) {
+    public String dispatch(final String wikiText, final EntryTypeName entryTypeName) {
+      final int start = builder.length();
       dispatch(wikiText, this.indexBuilder, entryTypeName);
+      return builder.substring(start);
     }
 
     @Override
@@ -212,17 +215,17 @@ public abstract class AbstractWiktionaryParser implements Parser {
     }
 
     @Override
-    public final void onNewline(WikiTokenizer wikiTokenizer) {
+    public void onNewline(WikiTokenizer wikiTokenizer) {
       assert false;
     }
 
     @Override
-    public final void onHeading(WikiTokenizer wikiTokenizer) {
+    public void onHeading(WikiTokenizer wikiTokenizer) {
       assert false;
     }
 
     @Override
-    public final void onListItem(WikiTokenizer wikiTokenizer) {
+    public void onListItem(WikiTokenizer wikiTokenizer) {
       assert false;
     }
   }
@@ -236,7 +239,7 @@ public abstract class AbstractWiktionaryParser implements Parser {
         final AppendAndIndexWikiCallback<T> appendAndIndexWikiCallback) {
       
       if (name != null) {
-        appendAndIndexWikiCallback.builder.append(name);
+        appendAndIndexWikiCallback.dispatch(name, null);
       }
       for (int i = 0; i < args.size(); ++i) {
         if (args.get(i).length() > 0) {
@@ -268,6 +271,4 @@ public abstract class AbstractWiktionaryParser implements Parser {
     }
   }
 
-
-
 }