From 5ebd41541e41c62ce5ac63c10aead2078ad23c7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Thu, 6 Oct 2016 00:27:21 +0200 Subject: [PATCH] Fix it-noun parser. Removes mnull entries in EN-IT dictionary. --- .../parser/wiktionary/EnFunctionCallbacks.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java index 29c57a9..5f7f850 100644 --- 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 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()); } -- 2.43.0