go

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

diff --git a/src/com/hughes/android/dictionary/Entry.java b/src/com/hughes/android/dictionary/Entry.java
index cd62f068f30c9f93a13b6667dfd8406cbbfcfa27..6143b4948d338c9e7f50b24b2ba04e2075a8e6b2 100755 (executable)
--- a/src/com/hughes/android/dictionary/Entry.java
+++ b/src/com/hughes/android/dictionary/Entry.java
@@ -140,13 +140,18 @@ public final class Entry implements RAFSerializable<Entry> {
   \r
   public Set<String> getIndexableTokens(final byte lang) {\r
     final Set<String> result = new LinkedHashSet<String>();\r
-    String text = Arrays.asList(getAllText(lang)).toString();\r
+    String text = " ";\r
+    for (final String subentry : getAllText(lang)) {\r
+      text += subentry + " ";\r
+    }\r
 \r
     text = text.replaceAll("fig\\.", " ");\r
     text = text.replaceAll("\\{[^\\}]+}", " ");\r
     text = text.replaceAll("\"-", "-");\r
     text = text.replaceAll("-\"", "-");\r
-    text = text.replaceAll("[\":/\\()<>\\[\\],;?!.]", " ");\r
+    text = text.replaceAll("[\"/\\()<>\\[\\],;?!.]", " ");\r
+    text = text.replaceAll("[:] ", " ");\r
+    text = text.replaceAll(" [:]", " ");\r
     result.addAll(Arrays.asList(WHITESPACE.split(text)));\r
 \r
     text = text.replaceAll("[-]", " ");\r