X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FNormalizeComparator.java;h=c744334b150ea5073aa9081e71915a40de606656;hb=c30780dce1351b55c0e94b05dd8ef327aa31cebd;hp=6583d495d1e3c03c3f240b5ddde7336df5013925;hpb=e9b9f5771bd4e4fd0d0fc1154949ed51a477ad6a;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java
index 6583d49..c744334 100644
--- a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java
+++ b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java
@@ -19,25 +19,44 @@ import com.ibm.icu.text.Transliterator;
 import java.util.Comparator;
 
 public class NormalizeComparator implements Comparator<String> {
-  
-  final Transliterator normalizer;
-  final Comparator<Object> comparator;
-
-  public NormalizeComparator(final Transliterator normalizer,
-      final Comparator<Object> comparator) {
-    this.normalizer = normalizer;
-    this.comparator = comparator;
-  }
-
-  @Override
-  public int compare(final String s1, final String s2) {
-    final String n1 = normalizer.transform(s1);
-    final String n2 = normalizer.transform(s2);
-    final int cn = comparator.compare(n1, n2);
-    if (cn != 0) {
-      return cn;
+
+    private final Transliterator normalizer;
+    private final Comparator<Object> comparator;
+    private final int version;
+
+    public NormalizeComparator(final Transliterator normalizer,
+                               final Comparator<Object> comparator, int version) {
+        this.normalizer = normalizer;
+        this.comparator = comparator;
+        this.version = version;
+    }
+
+    public static String withoutDash(final String a) {
+        return a.replace("-", "").replace("þ", "th").replace("Þ", "Th");
+    }
+
+    // Handles comparison between items containing "-".
+    // Also replaces other problematic cases like "thorn".
+    public static int compareWithoutDash(final String a, final String b, final Comparator<Object> c, int version) {
+        if (version < 7) return 0;
+        String s1 = withoutDash(a);
+        String s2 = withoutDash(b);
+        return c.compare(s1, s2);
+    }
+
+    @Override
+    public int compare(final String s1, final String s2) {
+        final String n1 = normalizer == null ? s1.toLowerCase() : normalizer.transform(s1);
+        final String n2 = normalizer == null ? s2.toLowerCase() : normalizer.transform(s2);
+        int cn = compareWithoutDash(n1, n2, comparator, version);
+        if (cn != 0) {
+            return cn;
+        }
+        cn = comparator.compare(n1, n2);
+        if (cn != 0) {
+            return cn;
+        }
+        return comparator.compare(s1, s2);
     }
-    return comparator.compare(s1, s2);
-  }
 
 }