go

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

diff --git a/src/com/hughes/android/dictionary/engine/IndexBuilder.java b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
index 0d6a3d938f87d8293756a0b1b9966e1459da85c9..172be90983e4d4bf22356e7178cf43b4ce6d11c4 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
@@ -24,11 +24,11 @@ public class IndexBuilder {
   IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language, final String normalizerRules, final boolean swapPairEntries) {
     this.dictionaryBuilder = dictionaryBuilder;
     index = new Index(dictionaryBuilder.dictionary, shortName, longName, language, normalizerRules, swapPairEntries);
-    tokenToData = new TreeMap<String, TokenData>(new NormalizeComparator(index.normalizer, language.collator));
+    tokenToData = new TreeMap<String, TokenData>(new NormalizeComparator(index.normalizer(), language.getCollator()));
   }
   
   public void build() {
-    final Set<EntryData> tokenEntryDatas = new HashSet<EntryData>();
+    final Set<IndexedEntry> tokenEntryDatas = new HashSet<IndexedEntry>();
     final List<RowBase> rows = index.rows;
     for (final TokenData tokenData : tokenToData.values()) {
       tokenEntryDatas.clear();
@@ -38,8 +38,8 @@ public class IndexBuilder {
 //      System.out.println("Added TokenRow: " + rows.get(rows.size() - 1));
       int numRows = 0;
 //      System.out.println("TOKEN: " + tokenData.token);
-      for (final Map.Entry<EntryTypeName, List<EntryData>> typeToEntry : tokenData.typeToEntries.entrySet()) {
-        for (final EntryData entryData : typeToEntry.getValue()) {
+      for (final Map.Entry<EntryTypeName, List<IndexedEntry>> typeToEntry : tokenData.typeToEntries.entrySet()) {
+        for (final IndexedEntry entryData : typeToEntry.getValue()) {
           if (tokenEntryDatas.add(entryData)) {
             rows.add(new PairEntry.Row(entryData.index(), rows.size(), index));
             ++numRows;
@@ -50,7 +50,8 @@ public class IndexBuilder {
           }
         }
       }
-      index.sortedIndexEntries.add(new Index.IndexEntry(tokenData.token, startRow, numRows));
+      index.sortedIndexEntries.add(new Index.IndexEntry(tokenData.token, index
+          .normalizer().transliterate(tokenData.token), startRow, numRows));
     }
     
     final List<IndexEntry> sortedEntries = new ArrayList<IndexEntry>(index.sortedIndexEntries);
@@ -68,7 +69,7 @@ public class IndexBuilder {
   static class TokenData {
     final String token;
         
-    final Map<EntryTypeName, List<EntryData>> typeToEntries = new EnumMap<EntryTypeName, List<EntryData>>(EntryTypeName.class);
+    final Map<EntryTypeName, List<IndexedEntry>> typeToEntries = new EnumMap<EntryTypeName, List<IndexedEntry>>(EntryTypeName.class);
     
     TokenData(final String token) {
       assert token.equals(token.trim());
@@ -86,15 +87,22 @@ public class IndexBuilder {
     return tokenData;
   }
 
-  public List<EntryData> getOrCreateEntries(final String token, final EntryTypeName entryTypeName) {
+  public List<IndexedEntry> getOrCreateEntries(final String token, final EntryTypeName entryTypeName) {
     final TokenData tokenData = getOrCreateTokenData(token);
-    List<EntryData> entries = tokenData.typeToEntries.get(entryTypeName);
+    List<IndexedEntry> entries = tokenData.typeToEntries.get(entryTypeName);
     if (entries == null) {
-      entries = new ArrayList<EntryData>();
+      entries = new ArrayList<IndexedEntry>();
       tokenData.typeToEntries.put(entryTypeName, entries);
     }
     return entries;
   }
+
+  public void addEntryWithTokens(final IndexedEntry entryData, final Set<String> tokens,
+      final EntryTypeName entryTypeName) {
+    for (final String token : tokens) {
+      getOrCreateEntries(token, entryTypeName).add(entryData);
+    }    
+  }
   
 
 }