X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FEnFunctionCallbacks.java;h=9a7d748ee12c768c346b538aa866a940932702c3;hb=58fd4402729f38bf4408e8fef487a9bc359e45a0;hp=41ee89f735b28e2dd34293142be10b3cbc3f9641;hpb=3bf8c5424c20dbb0e7219876f8699145f0e6db21;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
index 41ee89f..9a7d748 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
@@ -232,13 +232,17 @@ class EnFunctionCallbacks {
         final Map<String, String> namedArgs,
         final T parser,
         final AppendAndIndexWikiCallback<T> appendAndIndexWikiCallback) {
-      if (args.size() != 1 || !namedArgs.isEmpty()) {
-        EnParser.LOG.warning("weird qualifier: ");
+      if (!namedArgs.isEmpty()) {
+        EnParser.LOG.warning("weird qualifier: " + wikiTokenizer.token());
         return false;
       }
-      String qualifier = args.get(0);
       appendAndIndexWikiCallback.builder.append("(");
-      appendAndIndexWikiCallback.dispatch(qualifier, null);
+      for (int i = 0; i < args.size(); ++i) {
+          appendAndIndexWikiCallback.dispatch(args.get(i), null);
+          if (i > 0) {
+              appendAndIndexWikiCallback.builder.append(", ");
+          }
+      }
       appendAndIndexWikiCallback.builder.append(")");
       return true;
     }
@@ -252,7 +256,7 @@ class EnFunctionCallbacks {
         final Map<String, String> namedArgs,
         final T parser,
         final AppendAndIndexWikiCallback<T> appendAndIndexWikiCallback) {
-      //namedArgs.remove("lang");
+      namedArgs.remove("lang");
       if (!namedArgs.isEmpty()) {
         EnParser.LOG.warning("weird encoding: " + wikiTokenizer.token());
         return false;