X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FCheckDictionariesMain.java;h=811ebb04ab3e90c8ba49a919a58d26d0da62432e;hb=372a902551f43fc66b2a5e1c378392c84514c4d2;hp=97cfeefb52b58f720f11f33ed6f1aa2b6241e88f;hpb=1aa4de25c859304d21acfadd18cb546d1c21415b;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
index 97cfeef..811ebb0 100644
--- a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
+++ b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
@@ -4,22 +4,20 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.RandomAccessFile;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-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);
@@ -29,42 +27,36 @@ public class CheckDictionariesMain {
       }
       System.out.println(dictFile.getPath());
       
-      final DictionaryInfo dictionaryInfo = new DictionaryInfo();
       
       final RandomAccessFile raf = new RandomAccessFile(dictFile, "r");
       final Dictionary dict = new Dictionary(raf);
-      
+
+      final DictionaryInfo dictionaryInfo = dict.getDictionaryInfo();
+
       dictionaryInfo.uncompressedFilename = dictFile.getName();
+      dictionaryInfo.downloadUrl = BASE_URL + dictFile.getName() + "." + VERSION_CODE + ".zip";
+      // TODO: zip it right here....
       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...");
-      for (int i = 0; i < 2; ++i) {
-        dictionaryInfo.langIsos[i] = dict.indices.get(i).sortLanguage.getIsoCode();
-        final Index index = dict.indices.get(i);
-        for (final IndexEntry indexEntry : index.sortedIndexEntries) {
-          final TokenRow tokenRow = (TokenRow) index.rows.get(indexEntry.startRow);
-          dictionaryInfo.allTokenCounts[i]++; 
-          if (tokenRow.hasMainEntry) {
-            dictionaryInfo.mainTokenCounts[i]++; 
-          }
-        }
-      }
+      final String row = dictionaryInfo.append(new StringBuilder()).toString();
+      System.out.println(row + "\n");
+      
+      dictionaryInfoOut.println(row);
+      dictionaryInfoOut.flush();
       
       raf.close();
       
-      dictionaryInfoOut.println(dictionaryInfo.toTabSeparatedString());
-      dictionaryInfoOut.flush();
-      System.out.println(dictionaryInfo.toTabSeparatedString() + "\n");
     }
     
     dictionaryInfoOut.close();