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 dfc4abb434a5e44cf3d18ae8cf8b7a829859f7c6..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;
     }
     
@@ -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));
@@ -151,7 +153,8 @@ public class DictionaryBuilderMain extends TestCase {
       // Pairs without English.
       result.add(String.format("--lang1=%s", lang1));
       result.add(String.format("--lang2=%s", lang2));
-      
+      result.add(String.format("--dictInfo=Wikitionary-based %s-%s dictionary.", lang1, lang2));
+ 
       result.add(String.format("--input%d=%swikiSplit/en/EN.data", i, INPUTS));
       result.add(String.format("--input%dName=BETA!enwiktionary.%s-%s", i, lang1, lang2));
       result.add(String.format("--input%dFormat=%s", i, EnTranslationToTranslationParser.NAME));
@@ -169,7 +172,13 @@ public class DictionaryBuilderMain extends TestCase {
     
     // Build the non EN ones.
     final String[][] nonEnPairs = new String[][] {
-        
+
+        // The 3 I use most:
+        {"IT", "EN" },
+        {"DE", "EN" },
+        {"DE", "IT" },
+            
+            
         {"AR", "DE" },
         {"AR", "ES" },
         {"AR", "FR" },
@@ -199,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
@@ -277,7 +287,7 @@ public class DictionaryBuilderMain extends TestCase {
       done.add(pairList);
       
       if (!pairList.contains("IT") || !pairList.contains("EN")) {
-        continue;
+        //continue;
       }
       
       DictionaryBuilder.main(getMainArgs(pair).toArray(new String[0]));