Better DictionaryInfo, IndexBuilder counts main TokenRows.

[DictionaryPC.git] / src / com / hughes / android / dictionary / engine / CheckDictionariesMain.java

diff --git a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
index 36d69d3f72ccc1dd2450d53446d504def64c3413..898f46236416cf1437bf5a5254d6daaec7adf05d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
+++ b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java
@@ -4,18 +4,14 @@ 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";
+  static final String VERSION_CODE = "v003";
 
   public static void main(String[] args) throws IOException {
     final File dictDir = new File(DictionaryBuilderMain.OUTPUTS);
@@ -31,15 +27,15 @@ 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.creationMillis = dict.creationMillis;
       dictionaryInfo.uncompressedSize = dictFile.length();
 
       // Print it.
@@ -53,23 +49,14 @@ public class CheckDictionariesMain {
       
       // 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();