Add missing | in pattern.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / wiktionary / EnParser.java

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
index 7fdea865f3349c9533fcc6dc76f2d5b79dc54b36..1c7f912a4d6e533292bf0d1180fa339f72ada554 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
@@ -30,7 +30,7 @@ public abstract class EnParser extends AbstractWiktionaryParser {
 
   // TODO: process {{ttbc}} lines
   
-  static final Pattern partOfSpeechHeader = Pattern.compile(
+  public static final Pattern partOfSpeechHeader = Pattern.compile(
       "Noun|Verb|Adjective|Adverb|Pronoun|Conjunction|Interjection|" +
       "Preposition|Proper noun|Article|Prepositional phrase|Acronym|" +
       "Abbreviation|Initialism|Contraction|Prefix|Suffix|Symbol|Letter|" +
@@ -41,10 +41,9 @@ public abstract class EnParser extends AbstractWiktionaryParser {
       "Verb phrase|Transitive verb|Intransitive verb|Reflexive verb|" +
       // These are extras I found:
       "Determiner|Numeral|Number|Cardinal number|Ordinal number|Proverb|" +
-      "Particle|Interjection|Pronominal adverb" +
+      "Particle|Interjection|Pronominal adverb|" +
       "Han character|Hanzi|Hanja|Kanji|Katakana character|Syllable");
   
-  // Might only want to remove "lang" if it's equal to "zh", for example.
   static final Set<String> USELESS_WIKI_ARGS = new LinkedHashSet<String>(
       Arrays.asList(
           "lang",
@@ -91,6 +90,12 @@ public abstract class EnParser extends AbstractWiktionaryParser {
   final AppendAndIndexWikiCallback<EnParser> appendAndIndexWikiCallback = new AppendAndIndexCallback(this);
   {
     appendAndIndexWikiCallback.functionCallbacks.putAll(EnFunctionCallbacks.DEFAULT);
+    for (final String key : new ArrayList<String>(appendAndIndexWikiCallback.functionCallbacks.keySet())) {
+        // Don't handle the it-conj functions here.
+        if (key.startsWith("it-conj")) {
+            appendAndIndexWikiCallback.functionCallbacks.remove(key);
+        }
+    }
   }
   
   EnParser(final IndexBuilder enIndexBuilder, final IndexBuilder otherIndexBuilder, final Pattern langPattern, final Pattern langCodePattern, final boolean swap) {