Fix it-noun parser.

Removes mnull entries in EN-IT dictionary.

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
index 29c57a97c5d53ef127ad52d26268868c0e2799a4..5f7f85087db251128bc061f44e8628263745c0d1 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
@@ -725,15 +725,17 @@ class EnFunctionCallbacks {
         final EnParser parser,
         final AppendAndIndexWikiCallback<EnParser> appendAndIndexWikiCallback) {
       parser.titleAppended = true;
-      final String base = ListUtil.get(args, 0);
-      final String gender = ListUtil.get(args, 1);
-      final String singular = base + ListUtil.get(args, 2, null);
-      final String plural = base + ListUtil.get(args, 3, null);
+      final String gender = ListUtil.get(args, 0);
+      final String singular = parser.title;
+      final String plural = ListUtil.get(args, 1, null);
       appendAndIndexWikiCallback.builder.append(" ");
       appendAndIndexWikiCallback.dispatch(singular, null, null);
       appendAndIndexWikiCallback.builder.append(" {").append(gender).append("}, ");
-      appendAndIndexWikiCallback.dispatch(plural, null, null);
-      appendAndIndexWikiCallback.builder.append(" {pl}");
+      if (plural != null) {
+        appendAndIndexWikiCallback.dispatch(plural, null, null);
+        appendAndIndexWikiCallback.builder.append(" {pl}");
+        parser.wordForms.add(plural);
+      }
       final String f = namedArgs.remove("f");
       if (f != null) {
           appendAndIndexWikiCallback.builder.append(", ");
@@ -747,7 +749,6 @@ class EnFunctionCallbacks {
           appendAndIndexWikiCallback.builder.append(" {m}");
       }
       parser.wordForms.add(singular);
-      parser.wordForms.add(plural);
       if (!namedArgs.isEmpty() || args.size() > 4) {
         EnParser.LOG.warning("Invalid it-noun: " + wikiTokenizer.token());
       }