X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FAbstractWiktionaryParser.java;h=765ea9aef55faf1ab09cc444db2f6b312ed21b2e;hb=cd86f5f7abf5e545daf89c03d9dbbfd4e5bc65a4;hp=a189e58a85510b9f7c5832aee53f3355faf04556;hpb=ebed9a0fa85aae350c4d2af0b48dda5fa7b23db9;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 a189e58..765ea9a 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java
@@ -47,8 +47,8 @@ public abstract class AbstractWiktionaryParser implements Parser {
   final SortedMap<String, AtomicInteger> counters = new TreeMap<String, AtomicInteger>();
   final Set<String> pairsAdded = new LinkedHashSet<String>();
   
-  EntrySource entrySource;
-  String title;
+  public EntrySource entrySource;
+  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());
@@ -107,6 +108,10 @@ public abstract class AbstractWiktionaryParser implements Parser {
     }
     counter.incrementAndGet();
   }
+  
+  public void addLinkToCurrentEntry(final String token, final EntryTypeName entryTypeName) {
+      assert false : token;
+  }
 
   
   // -------------------------------------------------------------------------
@@ -151,8 +156,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,19 +219,20 @@ 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 +244,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) {