Synonyms, antonyms.

[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 76ae5db4c78c7f3af671e6b44b73b7d476e8d67b..ea9e1a72f1e6446264057eb9746f315103deb751 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -101,9 +101,11 @@ public class DictionaryBuilderMain extends TestCase {
             continue;
         }
         result.add(String.format("--input%d=%s", i, wikiSplitFile));
-        result.add(String.format("--input%dName=%sWiktionary.WholeSections.%s", i, wikitionaryLang, foreignIso));
+        result.add(String.format("--input%dName=%s.wiktionary.org (%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;
     }
     
@@ -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" },
             
             
@@ -206,7 +208,8 @@ public class DictionaryBuilderMain extends TestCase {
         {"DE", "TR" },  // Turkish
         {"DE", "ZH" },
         {"DE", "TA" },  // Tamil
-
+        
+        {"ES", "RU" },  // Spanish-Russian
         
         {"FR", "BG" },  // Bulgarian
         {"FR", "CS" },  // Czech