From 32ec9e62d688bf98aa7063203514564f9463f78b Mon Sep 17 00:00:00 2001
From: Thad Hughes <thad.hughes@gmail.com>
Date: Mon, 16 Jan 2012 09:55:25 -0800
Subject: [PATCH 1/1] DictionaryInfo has full file URL.

---
 .../engine/CheckDictionariesMain.java         | 23 +++++++++++--------
 .../engine/DictionaryBuilderMain.java         |  9 +++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
index 97cfeef..36d69d3 100644
--- a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
+++ b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
@@ -12,14 +12,16 @@ import java.util.List;
 import com.hughes.android.dictionary.DictionaryInfo;
 import com.hughes.android.dictionary.engine.Index.IndexEntry;
 
-
 public class CheckDictionariesMain {
+  
+  static final String BASE_URL = "http://quickdic-dictionary.googlecode.com/files/";
+  static final String VERSION_CODE = "v002";
 
   public static void main(String[] args) throws IOException {
     final File dictDir = new File(DictionaryBuilderMain.OUTPUTS);
     
     final PrintWriter dictionaryInfoOut = new PrintWriter(new File("../Dictionary/res/raw/dictionary_info.txt"));
-    dictionaryInfoOut.println("# LANG_1\t%LANG_2\tFILENAME\tFILESIZE\tNUM_MAIN_WORDS_1\tNUM_MAIN_WORDS_2\tNUM_ALL_WORDS_1\tNUM_ALL_WORDS_2");
+    dictionaryInfoOut.println("# LANG_1\t%LANG_2\tFILENAME\tVERSION_CODE\tFILESIZE\tNUM_MAIN_WORDS_1\tNUM_MAIN_WORDS_2\tNUM_ALL_WORDS_1\tNUM_ALL_WORDS_2");
 
     final File[] files = dictDir.listFiles();
     Arrays.sort(files);
@@ -35,16 +37,19 @@ public class CheckDictionariesMain {
       final Dictionary dict = new Dictionary(raf);
       
       dictionaryInfo.uncompressedFilename = dictFile.getName();
+      dictionaryInfo.downloadUrl = BASE_URL + dictFile.getName() + "." + VERSION_CODE + ".zip";
+      // TODO: zip it right here....
+      dictionaryInfo.creationMillis = dict.creationMillis;
       dictionaryInfo.uncompressedSize = dictFile.length();
 
       // Print it.
-      final PrintWriter textOut = new PrintWriter(new File(dictFile + ".text"));
-      final List<PairEntry> sorted = new ArrayList<PairEntry>(dict.pairEntries);
-      Collections.sort(sorted);
-      for (final PairEntry pairEntry : sorted) {
-        textOut.println(pairEntry.getRawText(false));
-      }
-      textOut.close();
+//      final PrintWriter textOut = new PrintWriter(new File(dictFile + ".text"));
+//      final List<PairEntry> sorted = new ArrayList<PairEntry>(dict.pairEntries);
+//      Collections.sort(sorted);
+//      for (final PairEntry pairEntry : sorted) {
+//        textOut.println(pairEntry.getRawText(false));
+//      }
+//      textOut.close();
       
       // Find the stats.
       System.out.println("Stats...");
diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
index 72ea6af..8ac7283 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -26,10 +26,7 @@ public class DictionaryBuilderMain extends TestCase {
   static final String INPUTS = "data/inputs/";
   static final String STOPLISTS = "data/inputs/stoplists/";
   static final String OUTPUTS = "data/outputs/";  
-  
-  static final String VERSION_SUFFIX = "v002";
-
-  
+    
   public static void main(final String[] args) throws Exception {
     
     // Builds all the dictionaries it can, outputs list to a text file.
@@ -75,7 +72,7 @@ public class DictionaryBuilderMain extends TestCase {
         continue;
       }
 
-        final String dictFile = String.format("%s/EN-%s_enwiktionary.%s.quickdic", OUTPUTS, foreignIso, VERSION_SUFFIX);
+        final String dictFile = String.format("%s/EN-%s_enwiktionary.quickdic", OUTPUTS, foreignIso);
         System.out.println("building dictFile: " + dictFile);
         
         if (!isoToStoplist.containsKey(foreignIso)) {
@@ -114,7 +111,7 @@ public class DictionaryBuilderMain extends TestCase {
         
     }  // foreignIso
 
-    final String dictFile = String.format("%s/DE-EN_chemnitz_enwiktionary.%s.quickdic", OUTPUTS, VERSION_SUFFIX);
+    final String dictFile = String.format("%s/DE-EN_chemnitz_enwiktionary.%s.quickdic", OUTPUTS);
     DictionaryBuilder.main(new String[] {
         "--dictOut=" + dictFile,
         "--lang1=DE",
-- 
2.43.0