Enable single-language dictionary

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

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
index 1d47448425bb87c55db87a52f21fe4fc2bc49f62..5d5eb5e5e67030dfcb4f33fb06cf650e30971e60 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
@@ -32,6 +32,7 @@ import org.xml.sax.SAXException;
 
 import com.hughes.android.dictionary.parser.DictFileParser;
 import com.hughes.android.dictionary.parser.Parser;
+import com.hughes.android.dictionary.parser.SingleDictFileParser;
 import com.hughes.android.dictionary.parser.wiktionary.EnForeignParser;
 import com.hughes.android.dictionary.parser.wiktionary.EnToTranslationParser;
 import com.hughes.android.dictionary.parser.wiktionary.EnTranslationToTranslationParser;
@@ -150,10 +151,13 @@ public class DictionaryBuilder {
                 String inputFormat = keyValueArgs.remove(prefix + "Format");
                 if ("tab_separated".equals(inputFormat)) {
                     final boolean flipColumns = "true".equals(keyValueArgs.remove(prefix + "FlipColumns"));
-                    new DictFileParser(charset, flipColumns, DictFileParser.TAB, null, dictionaryBuilder).parse(file, entrySource, pageLimit);
+                    new DictFileParser(charset, flipColumns, DictFileParser.TAB, null, (lang2 == null), dictionaryBuilder).parse(file, entrySource, pageLimit);
+               } else if ("html_tab_separated".equals(inputFormat)) {
+                    new SingleDictFileParser(charset, DictFileParser.TAB, dictionaryBuilder).parse(file, entrySource, pageLimit);
+               
                 } else if ("chemnitz".equals(inputFormat)) {
                     final boolean flipColumns = "true".equals(keyValueArgs.remove(prefix + "FlipColumns"));
-                    new DictFileParser(charset, flipColumns, DictFileParser.DOUBLE_COLON, DictFileParser.PIPE, dictionaryBuilder).parse(file, entrySource, pageLimit);
+                    new DictFileParser(charset, flipColumns, DictFileParser.DOUBLE_COLON, DictFileParser.PIPE, (lang2 == null), dictionaryBuilder).parse(file, entrySource, pageLimit);
                 } else if ("enwiktionary".equals(inputFormat)) {
                     final String type = keyValueArgs.remove(prefix + "WiktionaryType");
                     final Pattern langPattern = Pattern.compile(keyValueArgs.remove(prefix + "LangPattern"), Pattern.CASE_INSENSITIVE);