Escape HTML. Test special ISO coding.

[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 c17ebec6717e5bff24da762eb7bf493797520195..2df52e704e1ae283138c65613ef4b81f3f5669aa 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import com.hughes.android.dictionary.parser.wiktionary.EnTranslationToTranslationParser;
+import com.hughes.android.dictionary.parser.wiktionary.WholeSectionToHtmlParser;
 import com.hughes.android.dictionary.parser.wiktionary.WiktionaryLangs;
 
 public class DictionaryBuilderMain extends TestCase {
@@ -108,7 +109,7 @@ public class DictionaryBuilderMain extends TestCase {
       }
       
       result.add(String.format("--input%d=%s/wikiSplit/en/%s.data", i, INPUTS, foreignIso));
-      result.add(String.format("--input%dName=enwiktionary.%s", i, foreignIso)) ;
+      result.add(String.format("--input%dName=ENWiktionary.%s", i, foreignIso)) ;
       result.add(String.format("--input%dFormat=enwiktionary", i));
       result.add(String.format("--input%dWiktionaryType=EnForeign", i));
       result.add(String.format("--input%dLangPattern=%s", i, foreignRegex));
@@ -132,6 +133,13 @@ public class DictionaryBuilderMain extends TestCase {
         result.add(String.format("--input%dFormat=chemnitz", i));
         ++i;
       }
+      
+      result.add(String.format("--input%d=%s/wikiSplit/en/%s.data", i, INPUTS, foreignIso));
+      result.add(String.format("--input%dName=%s", i, "ENWiktionary.WholeSections.%s", foreignIso));
+      result.add(String.format("--input%dFormat=%s", i, WholeSectionToHtmlParser.NAME));
+      result.add(String.format("--input%dTitleIndex=%d", i, 3 - enIndex));
+      ++i;
+
     } else {
       // Pairs without English.
       result.add(String.format("--lang1=%s", lang1));
@@ -255,6 +263,10 @@ public class DictionaryBuilderMain extends TestCase {
       }
       done.add(pairList);
       
+      if (!pairList.contains("IT") || !pairList.contains("EN")) {
+        continue;
+      }
+      
       DictionaryBuilder.main(getMainArgs(pair).toArray(new String[0]));
     }