Changeset 4968

Timestamp:

04/14/14 12:57:31 (10 years ago)

Author:

Twan Goosen

Message:

implemented encoding of selection type into query parameters
(note: previous commit was actually decoding)

Location:

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

Files:

• main/java/eu/clarin/cmdi/vlo/service/solr/impl/QueryFacetsSelectionParametersConverter.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java (modified) (2 diffs)

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

@@ -102 +102 @@
 
         // put all selections in 'fq' parameters
-        for (Entry<String, FacetSelection> facetSelection : selection.getSelection().entrySet()) {
-            //Assuming AND            
-            //TODO: encode NOT,OR
-            for (String value : facetSelection.getValue().getValues()) {
-                params.add(FILTER_QUERY, String.format("%s:%s", facetSelection.getKey(), value));
+        for (Entry<String, FacetSelection> facetSelectionEntry : selection.getSelection().entrySet()) {
+            final String facet = facetSelectionEntry.getKey();
+            final FacetSelection facetSelection = facetSelectionEntry.getValue();
+            // put a parameter for the selection type (unless it is AND which is default)
+            if (facetSelection.getSelectionType() != FacetSelectionType.AND) {
+                params.add(FILTER_QUERY_TYPE, String.format("%s:%s", facet, facetSelection.getSelectionType().toString().toLowerCase()));
+            }
+            for (String value : facetSelection.getValues()) {
+                //TODO: Encode?
+                params.add(FILTER_QUERY, String.format("%s:%s", facet, value));
             }
         }

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

@@ -110 +110 @@
         final String query = "query";
         final Map<String, FacetSelection> map = Maps.newHashMapWithExpectedSize(3);
-        map.put("facet1", new FacetSelection(Arrays.asList("valueA", "valueB")));
-        map.put("facet2", new FacetSelection(Collections.singleton("valueC")));
+        map.put("facet1", new FacetSelection(FacetSelectionType.OR, Arrays.asList("valueA", "valueB")));
+        map.put("facet2", new FacetSelection(FacetSelectionType.AND, Collections.singleton("valueC")));
+        map.put("facet3", new FacetSelection(FacetSelectionType.NOT_EMPTY));
 
         QueryFacetsSelection selection = new QueryFacetsSelection(query, map);
@@ -123 +124 @@
         assertThat(fq, hasItem(StringValue.valueOf("facet1:valueB")));
         assertThat(fq, hasItem(StringValue.valueOf("facet2:valueC")));
+
+        final List<StringValue> fqType = result.getValues("fqType");
+        assertNotNull(fqType);
+        assertThat(fqType, hasItem(StringValue.valueOf("facet1:or")));
+        //facet 2 is AND, which is default and should not be encoded
+        assertThat(fqType, hasItem(StringValue.valueOf("facet3:not_empty")));
     }