it-noun.

[DictionaryPC.git] / src / com / hughes / android / dictionary / engine / DictionaryBuilderMain.java

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
index 8a657f7d447afff05389bec434d7b72d1e676a75..981e6b531745743599969480e7a51261ce29837a 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -104,6 +104,8 @@ public class DictionaryBuilderMain extends TestCase {
         result.add(String.format("--input%dName=%sWiktionary.WholeSections.%s", i, wikitionaryLang, foreignIso));
         result.add(String.format("--input%dFormat=%s", i, WholeSectionToHtmlParser.NAME));
         result.add(String.format("--input%dTitleIndex=%d", i, Arrays.asList(pair).indexOf(foreignIso) + 1));
+        result.add(String.format("--input%dWiktionaryLang=%s", i, wikitionaryLang));
+        result.add(String.format("--input%dSkipLang=%s", i, foreignIso));
         ++i;
     }
     
@@ -117,8 +119,8 @@ public class DictionaryBuilderMain extends TestCase {
         foreignRegex = "Chinese|Mandarin|Cantones";
       }
       
-      result.add(String.format("--lang1=%s", "EN"));
-      result.add(String.format("--lang2=%s",  foreignIso));
+      result.add(String.format("--lang1=%s", lang1));
+      result.add(String.format("--lang2=%s",  lang2));
       result.add(String.format("--dictInfo=(EN)Wikitionary-based EN-%s dictionary.%s", foreignIso, getDedication(foreignIso)));
       
       result.add(String.format("--input%d=%s/wikiSplit/en/%s.data", i, INPUTS, foreignIso));
@@ -172,8 +174,8 @@ public class DictionaryBuilderMain extends TestCase {
     final String[][] nonEnPairs = new String[][] {
 
         // The 3 I use most:
-        {"DE", "EN" },
         {"IT", "EN" },
+        {"DE", "EN" },
         {"DE", "IT" },