From 3fcb5f1e69dd89795d1c8c4ba207328c688cec06 Mon Sep 17 00:00:00 2001 From: Thad Hughes Date: Sun, 7 Apr 2013 10:53:36 -0700 Subject: [PATCH] go --- .../engine/DictionaryBuilderTest.java | 21 +++++++++++++++++++ .../dictionary/parser/DictFileParser.java | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java index 6e5fa3f..417df82 100644 --- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java +++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java @@ -325,6 +325,27 @@ public class DictionaryBuilderTest extends TestCase { checkGolden(name, result); } + public void testItalianTurkish() throws Exception { + final String name = "it-tr_dictcc.quickdic"; + final File result = new File(TEST_OUTPUTS + name); + System.out.println("Writing to: " + result); + DictionaryBuilder.main(new String[] { + "--dictOut=" + result.getAbsolutePath(), + "--lang1=IT", + "--lang2=TR", + "--dictInfo=it-tr_dictcc_simulated", + + "--input1=" + TEST_INPUTS + "it-tr_dictcc_simulated.txt", + "--input1Name=dictcc", + "--input1Charset=UTF8", + "--input1Format=tab_separated", + + "--print=" + result.getPath() + ".text", + }); + + checkGolden(name, result); + } + private void checkGolden(final String dictName, final File dictFile) throws IOException, FileNotFoundException { // Check it once: diff --git a/src/com/hughes/android/dictionary/parser/DictFileParser.java b/src/com/hughes/android/dictionary/parser/DictFileParser.java index c0ea59d..8015f9a 100644 --- a/src/com/hughes/android/dictionary/parser/DictFileParser.java +++ b/src/com/hughes/android/dictionary/parser/DictFileParser.java @@ -112,7 +112,8 @@ public class DictFileParser implements Parser { return; } final String[] fields = fieldSplit.split(line); - if (fields.length != 2) { + // dictcc now has a part of speech field as field #3. + if (fields.length < 2 || fields.length > 3) { logger.warning("Malformed line: " + line); return; } @@ -137,7 +138,7 @@ public class DictFileParser implements Parser { subfields[0] = new String[] { fields[0] }; subfields[1] = new String[] { fields[1] }; } - + final PairEntry pairEntry = new PairEntry(entrySource); for (int i = 0; i < subfields[0].length; ++i) { subfields[0][i] = subfields[0][i].trim(); -- 2.43.0