X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fenwiktionary%2FAppendAndIndexWikiCallback.java;h=4a48a61100384a3b24789e389829645d0446cc2b;hb=d06b99b469b18cfa4a8a4bd45d51ee4ebd7efaca;hp=8e15fcea52d6b6785f716351be9bd27497a76352;hpb=90ec4974a7834567b5721528e87a2ce857cce53b;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java b/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
index 8e15fce..4a48a61 100644
--- a/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
+++ b/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
@@ -51,7 +51,7 @@ final class AppendAndIndexWikiCallback implements WikiTokenizer.Callback {
   public void onPlainText(final String plainText) {
     // The only non-recursive callback.  Just appends to the builder, and indexes.
     builder.append(plainText);
-    if (indexBuilder != null && entryTypeName != null) {
+    if (indexBuilder != null && entryTypeName != null && indexedEntry != null) {
       indexBuilder.addEntryWithString(indexedEntry, plainText, entryTypeName);
     }
   }
@@ -98,7 +98,7 @@ final class AppendAndIndexWikiCallback implements WikiTokenizer.Callback {
     FunctionCallback functionCallback = functionCallbacks.get(name);
     if (functionCallback == null) {
       if (
-          name.equals("form of") || 
+          name.equals("form of") || // TODO: switch to contains
           name.contains("conjugation of") || 
           name.contains("participle of") || 
           name.contains("gerund of") ||