Changeset 5117

Timestamp:

05/02/14 09:09:56 (10 years ago)

Author:

Twan Goosen

Message:

Using collator for comparison when sorting by value in facet field values provider
Fixes #544

Location:

vlo/trunk/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) (5 diffs)
• test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java (modified) (2 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
+import java.text.Collator;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.wicket.Session;
+import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -44 +50 @@
 public class FacetFieldValuesProvider extends SortableDataProvider<FacetField.Count, FieldValuesOrder> {
 
+    private final static Logger logger = LoggerFactory.getLogger(FacetFieldValuesProvider.class);
     private final IModel<FacetField> model;
     private final int maxNumberOfItems;
@@ -169 +176 @@
         final Ordering ordering;
         if (getSort().getProperty() == FieldValuesOrder.COUNT) {
-            ordering = COUNT_ORDERING;
+            ordering = countOrdering;
         } else if (getSort().getProperty() == FieldValuesOrder.NAME) {
-            ordering = NAME_ORDERING;
+            ordering = nameOrdering;
         } else {
             ordering = Ordering.natural();
@@ -183 +190 @@
     }
 
-    private static Ordering<FacetField.Count> COUNT_ORDERING = new Ordering<FacetField.Count>() {
+    private final Ordering<FacetField.Count> countOrdering = new Ordering<FacetField.Count>() {
 
         @Override
@@ -191 +198 @@
     };
 
-    private static Ordering<FacetField.Count> NAME_ORDERING = new Ordering<FacetField.Count>() {
+    private final Ordering<FacetField.Count> nameOrdering = new Ordering<FacetField.Count>() {
+        private final Collator collator;
+
+        {
+            collator = Collator.getInstance(getLocale());
+            collator.setStrength(Collator.PRIMARY);
+        }
 
         @Override
         public int compare(Count arg0, Count arg1) {
-            // TODO: From old VLO:
-            return arg0.getName().compareToIgnoreCase(arg1.getName());
+            return collator.compare(arg0.getName(), arg1.getName());
         }
     };
+
+    protected Locale getLocale() {
+        try {
+            final Session session = Session.get();
+            if (session != null) {
+                return session.getLocale();
+            }
+        } catch (WicketRuntimeException ex) {
+            logger.info("No session available, falling back to JVM default locale");
+        }
+        return Locale.getDefault();
+    }
 
     /**

vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProviderTest.java

@@ -22 +22 @@
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Locale;
+import java.util.Locale;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -188 +190 @@
         valueCount = result.next();
         assertEquals("first value", valueCount.getName());
+
+        assertFalse(result.hasNext());
+    }
+
+    /**
+     * Test of iterator method, of class FacetFieldValuesProvider.
+     */
+    @Test
+    public void testIteratorNameOrderCollation() {
+        facetField = new FacetField("field");
+        facetField.add("a value", 1);
+        facetField.add("some other value", 1);
+        facetField.add("à€œà€Ÿà€€", 1);
+        facetField.add("Etwas anderes", 1);
+        facetField.add("één nederlandse waarde", 1);
+
+        final FacetFieldValuesProvider instance = new FacetFieldValuesProvider(Model.of(facetField), 10, LOW_PRIORITY_VALUES, new SortParam<FieldValuesOrder>(FieldValuesOrder.NAME, true)) {
+
+            @Override
+            protected Locale getLocale() {
+                return Locale.ENGLISH;
+            }
+
+        };
+
+        final long first = 0;
+        final long count = 100;
+        final Iterator<? extends FacetField.Count> result = instance.iterator(first, count);
+
+        //sorted by name (ascending)
+        assertTrue(result.hasNext());
+        assertEquals("a value", result.next().getName());
+
+        // diacritics
+        assertTrue(result.hasNext());
+        assertEquals("één nederlandse waarde", result.next().getName());
+
+        // capitalisation
+        assertTrue(result.hasNext());
+        assertEquals("Etwas anderes", result.next().getName());
+
+        assertTrue(result.hasNext());
+        assertEquals("some other value", result.next().getName());
+
+        // other scripts
+        assertTrue(result.hasNext());
+        assertEquals("à€œà€Ÿà€€", result.next().getName());
 
         assertFalse(result.hasNext());