Changeset 4967

Timestamp:

04/14/14 12:44:56 (10 years ago)

Author:

Twan Goosen

Message:

implemented encoding of selection type into query parameters

Location:

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

Files:

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

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWebAppParameters.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package eu.clarin.cmdi.vlo;
 
@@ -23 +22 @@
  */
 public class VloWebAppParameters {
+
     public final static String THEME = "theme";
     public final static String DOCUMENT_ID = "docId";
     public static final String QUERY = "q";
     public static final String FILTER_QUERY = "fq";
+    public static final String FILTER_QUERY_TYPE = "fqType";
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -35 +35 @@
     }
 
+    public FacetSelection(FacetSelectionType type) {
+        this(type, Lists.<String>newArrayList());
+    }
+
     public FacetSelection(FacetSelectionType selectionType, Collection<String> values) {
         this.selectionType = selectionType;

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

@@ -18 +18 @@
 
 import com.google.common.collect.Maps;
+import static eu.clarin.cmdi.vlo.VloWebAppParameters.*;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetSelectionType;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
@@ -27 +29 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
-import static eu.clarin.cmdi.vlo.VloWebAppParameters.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -36 +39 @@
 public class QueryFacetsSelectionParametersConverter implements PageParametersConverter<QueryFacetsSelection> {
 
+    public final static Logger logger = LoggerFactory.getLogger(QueryFacetsSelectionParametersConverter.class);
+
     @Override
     public QueryFacetsSelection fromParameters(PageParameters params) {
-        // Assuming AND. TODO: decode NOT,OR,not empty. Abandon multimap stategy?
         // Get query string from params
         final String query = params.get(QUERY).toOptionalString();
 
+        final List<StringValue> facetSelectionTypes = params.getValues(FILTER_QUERY_TYPE);
+        final List<StringValue> facetValues = params.getValues(FILTER_QUERY);
+        final HashMap<String, FacetSelection> selection = Maps.newHashMapWithExpectedSize(facetValues.size());
+
+        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();
+
+                    try {
+                        final FacetSelectionType facetSelectionType = FacetSelectionType.valueOf(type);
+                        selection.put(facet, new FacetSelection(facetSelectionType));
+                    } catch (IllegalArgumentException ex) {
+                        logger.warn("Unknown selection type passed into query parameter {}: {}", FILTER_QUERY_TYPE, type);
+                    }
+                } else {
+                    logger.info("Illegal query parameter value for {}: {}", FILTER_QUERY_TYPE, selectionType);
+                }
+            }
+        }
+
         // Get facet selections from params
-        final List<StringValue> facetValues = params.getValues(FILTER_QUERY);
-
-        final HashMap<String, FacetSelection> selection = Maps.newHashMapWithExpectedSize(facetValues.size());
         for (StringValue facetValue : facetValues) {
             if (!facetValue.isEmpty()) {
-                String[] fq = facetValue.toString().split(":");
+                final String[] fq = facetValue.toString().split(":");
                 if (fq.length == 2) {
                     // we have a facet - value pair
@@ -58 +82 @@
                         selection.put(facet, new FacetSelection(Arrays.asList(value)));
                     }
+                } else {
+                    logger.info("Illegal query parameter value for {}: {}", FILTER_QUERY, facetValue);
                 }
             }

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

@@ -20 +20 @@
 import com.google.common.collect.Maps;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetSelectionType;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.Arrays;
@@ -59 +60 @@
         params.add("fq", "facet1:valueB");
         params.add("fq", "facet2:valueC");
+        params.add("fq", "illegal-no-colon"); //should get ignored
         params.add("fq", ""); // not a valid facet selection
         params.add("fq", "invalid"); // not a valid facet selection
+        params.add("fqType", "facet1:or");
+        params.add("fqType", "facet3:not_empty");
+        params.add("fqType", "facet4:illegaltype"); //should get ignored
+        params.add("fqType", "illegal-no-colon"); //should get ignored
 
         final QueryFacetsSelection result = instance.fromParameters(params);
         assertEquals("query", result.getQuery());
-        assertEquals(2, result.getFacets().size());
+        assertEquals(3, result.getFacets().size());
         assertThat(result.getFacets(), hasItem("facet1"));
         assertThat(result.getFacets(), hasItem("facet2"));
@@ -70 +76 @@
         assertThat(result.getSelectionValues("facet1").getValues(), hasItem("valueB"));
         assertThat(result.getSelectionValues("facet2").getValues(), hasItem("valueC"));
+        // OR explicitly set
+        assertEquals(FacetSelectionType.OR, result.getSelectionValues("facet1").getSelectionType());
+        // AND is default
+        assertEquals(FacetSelectionType.AND, result.getSelectionValues("facet2").getSelectionType());
+        // NOT_EMPTY explicitly set
+        assertEquals(FacetSelectionType.NOT_EMPTY, result.getSelectionValues("facet3").getSelectionType());
     }