go

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderTest.java
index 6e5fa3fa13959cd7c829b08ea5d5416a8a2c9d33..417df82d420112076e0423ca1a61abf70f675780 100644 (file)
--- 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 c0ea59df5383bb45452f11d4596198a57f1d6af6..8015f9a04ae7fd65e5a233d73c03e9e02a594852 100644 (file)
--- 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();