X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilder.java;h=5d5eb5e5e67030dfcb4f33fb06cf650e30971e60;hb=020aa910526ece05ee8514e55a9a951b45ce1fea;hp=34cc705c39592cf45a5b3efa22bd4da39460a9c9;hpb=96e85ff86f44888a9994710d55e760893d87da76;p=DictionaryPC.git diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java index 34cc705..5d5eb5e 100644 --- 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, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).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, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).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);