X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FDictionaryBuilder.java;h=01c65b9c8124b78b2965f7231b71505af7016d76;hb=56f929aaead3d3163ce2634d01e64ba5cd4b47eb;hp=a3cc7c02cd5b7354a7d23b928eda7ae895cd66a2;hpb=b6bfead63fc4b123370918bea4d2899d73698038;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
index a3cc7c0..01c65b9 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
@@ -20,6 +20,7 @@ import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -55,13 +56,18 @@ public class DictionaryBuilder {
   }
   
   public static void main(final String[] args) throws IOException, ParserConfigurationException, SAXException {
+    System.out.println("Running with arguments:");
+    for (final String arg : args) {
+      System.out.println(arg);
+    }
+    
     final Map<String,String> keyValueArgs = Args.keyValueArgs(args);
     
-    final Language lang1 = Language.lookup(keyValueArgs.remove("lang1"));
-    final Language lang2 = Language.lookup(keyValueArgs.remove("lang2"));
-    if (lang1 == null || lang2 == null) {
+    if (!keyValueArgs.containsKey("lang1") || !keyValueArgs.containsKey("lang2")) {
       fatalError("--lang1= and --lang2= must both be specified.");
     }
+    final Language lang1 = Language.lookup(keyValueArgs.remove("lang1"));
+    final Language lang2 = Language.lookup(keyValueArgs.remove("lang2"));
 
     final Set<String> lang1Stoplist = new LinkedHashSet<String>();
     final Set<String> lang2Stoplist = new LinkedHashSet<String>();
@@ -126,10 +132,12 @@ public class DictionaryBuilder {
         System.out.println("");
         
         String inputFormat = keyValueArgs.remove(prefix + "Format");
-        if ("dictcc".equals(inputFormat)) {
-          new DictFileParser(charset, false, DictFileParser.TAB, null, dictionaryBuilder, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).parseFile(file);
+        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).parseFile(file);
         } else if ("chemnitz".equals(inputFormat)) {
-          new DictFileParser(charset, false, DictFileParser.DOUBLE_COLON, DictFileParser.PIPE, dictionaryBuilder, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).parseFile(file);
+          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).parseFile(file);
         } else if ("enwiktionary".equals(inputFormat)) {
           final Pattern langPattern = Pattern.compile(keyValueArgs.remove(prefix + "LangPattern"), Pattern.CASE_INSENSITIVE);
           final Pattern langCodePattern = Pattern.compile(keyValueArgs.remove(prefix + "LangCodePattern"));
@@ -176,6 +184,8 @@ public class DictionaryBuilder {
   
   private static void fatalError(String string) {
     System.err.println(string);
+    
+    
     System.exit(1);
   }