Changeset 4999

Timestamp:

04/17/14 07:39:46 (10 years ago)

Author:

Twan Goosen

Message:

fixed issue with lost selection if fq value contains a colon

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java (modified) (4 diffs)
• test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java (modified) (4 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;
 import static eu.clarin.cmdi.vlo.VloWebAppParameters.*;
@@ -40 +41 @@
 
     public final static Logger logger = LoggerFactory.getLogger(QueryFacetsSelectionParametersConverter.class);
+    /**
+     * Splitter for facet query strings like "language:Dutch". Because it is
+     * limited to two tokens, will also work for strings with a colon in their
+     * value such as "collection:TLA: DoBeS archive".
+     */
+    public final static Splitter FILTER_SPLITTER = Splitter.on(":").limit(2);
 
     @Override
@@ -52 +59 @@
         for (StringValue selectionType : facetSelectionTypes) {
             if (!selectionType.isEmpty()) {
-                final String[] fqType = selectionType.toString().split(":");
-                if (fqType.length == 2) {
-                    final String facet = fqType[0];
-                    final String type = fqType[1].toUpperCase();
+                final List<String> fqType = FILTER_SPLITTER.splitToList(selectionType.toString());
+                if (fqType.size() == 2) {
+                    final String facet = fqType.get(0);
+                    final String type = fqType.get(1).toUpperCase();
 
                     try {
@@ -72 +79 @@
         for (StringValue facetValue : facetValues) {
             if (!facetValue.isEmpty()) {
-                final String[] fq = facetValue.toString().split(":");
-                if (fq.length == 2) {
+                final List<String> fq = FILTER_SPLITTER.splitToList(facetValue.toString());
+                if (fq.size() == 2) {
                     // we have a facet - value pair
-                    final String facet = fq[0];
-                    final String value = fq[1];
+                    final String facet = fq.get(0);
+                    final String value = fq.get(1);
                     if (selection.containsKey(facet)) {
                         selection.get(facet).getValues().add(value);

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java

@@ -58 +58 @@
         params.add("fq", "facet1:valueA");
         params.add("fq", "facet1:valueB");
-        params.add("fq", "facet2:valueC");
+        params.add("fq", "facet2:value:C"); // has a colon in value
         params.add("fq", "illegal-no-colon"); //should get ignored
         params.add("fq", ""); // not a valid facet selection
@@ -74 +74 @@
         assertThat(result.getSelectionValues("facet1").getValues(), hasItem("valueA"));
         assertThat(result.getSelectionValues("facet1").getValues(), hasItem("valueB"));
-        assertThat(result.getSelectionValues("facet2").getValues(), hasItem("valueC"));
+        assertThat(result.getSelectionValues("facet2").getValues(), hasItem("value:C"));
         // OR explicitly set
         assertEquals(FacetSelectionType.OR, result.getSelectionValues("facet1").getSelectionType());
@@ -110 +110 @@
         final Map<String, FacetSelection> map = Maps.newHashMapWithExpectedSize(3);
         map.put("facet1", new FacetSelection(FacetSelectionType.OR, Arrays.asList("valueA", "valueB")));
-        map.put("facet2", new FacetSelection(FacetSelectionType.AND, Collections.singleton("valueC")));
+        map.put("facet2", new FacetSelection(FacetSelectionType.AND, Collections.singleton("value:C")));
         map.put("facet3", new FacetSelection(FacetSelectionType.NOT_EMPTY));
 
@@ -122 +122 @@
         assertThat(fq, hasItem(StringValue.valueOf("facet1:valueA")));
         assertThat(fq, hasItem(StringValue.valueOf("facet1:valueB")));
-        assertThat(fq, hasItem(StringValue.valueOf("facet2:valueC")));
+        assertThat(fq, hasItem(StringValue.valueOf("facet2:value:C")));
 
         final List<StringValue> fqType = result.getValues("fqType");