Multi word search now looks for exact matches of TokenRows.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 75751c711c1a165c01dd46544a5d0134c7136c9b..b008ea9677ae88d5088632e41e83120c058a16be 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -79,6 +79,7 @@ import com.hughes.android.dictionary.engine.TokenRow;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
 import com.hughes.android.util.IntentLauncher;
 import com.hughes.android.util.NonLinkClickableSpan;
+import com.hughes.util.StringUtil;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -1022,7 +1023,7 @@ public class DictionaryActivity extends ListActivity {
         boolean done = false;
 
         SearchOperation(final String searchText, final Index index) {
-            this.searchText = searchText.trim();
+            this.searchText = StringUtil.normalizeWhitespace(searchText);
             this.index = index;
         }
 
@@ -1039,7 +1040,7 @@ public class DictionaryActivity extends ListActivity {
                     searchResult = index.findInsertionPoint(searchText, interrupted);
                 } else {
                     searchTokens = Arrays.asList(searchTokenArray);
-                    multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted);
+                    multiWordSearchResult = index.multiWordSearch(searchText, searchTokens, interrupted);
                 }
                 Log.d(LOG,
                         "searchText=" + searchText + ", searchDuration="