Changeset 6315

Timestamp:

06/22/15 09:39:44 (9 years ago)

Author:

Twan Goosen

Message:

Added filter for selecting collections only
Refs #382

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• service/impl/QueryFacetsSelectionParametersConverter.java (modified) (3 diffs)
• service/solr/impl/AbstractSolrQueryFactory.java (modified) (1 diff)
• wicket/panels/BreadCrumbPanel.java (modified) (1 diff)
• wicket/panels/search/AdvancedSearchOptionsPanel.html (modified) (1 diff)
• wicket/panels/search/AdvancedSearchOptionsPanel.java (modified) (4 diffs)

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

@@ -27 +27 @@
 import eu.clarin.cmdi.vlo.service.FacetParameterMapper;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
+import eu.clarin.cmdi.vlo.wicket.panels.search.AdvancedSearchOptionsPanel;
+import static eu.clarin.cmdi.vlo.wicket.panels.search.AdvancedSearchOptionsPanel.OPTIONS_FIELDS;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -53 +55 @@
     public final static Splitter FILTER_SPLITTER = Splitter.on(":").limit(2);
 
+    /**
+     * Fields that aren't true facets but can be queried by the user via the
+     * {@link AdvancedSearchOptionsPanel}
+     */
     private final Set<String> facetsDefined;
     private final FacetParameterMapper facetParamMapper;
@@ -93 +99 @@
                     final String type = fqType.get(1).toUpperCase();
 
-                    if (facetsDefined.contains(facet)) {
+                    if (facetsDefined.contains(facet) || OPTIONS_FIELDS.contains(facet)) {
                         try {
                             final FacetSelectionType facetSelectionType = FacetSelectionType.valueOf(type);

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

@@ -52 +52 @@
                         case NOT_EMPTY:
                             //TODO: test
-                            encodedQueries.add(String.format("%s:['' TO *]", facetName));
+                            encodedQueries.add(String.format("%s:[* TO *]", facetName));
                             break;
                         case AND:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.java

@@ -208 +208 @@
 
         private String getAnyValueString() {
-            if (FacetConstants.FIELD_SEARCH_SERVICE.equals(facet)) {
-                return "Content searchable";
-            }
-            return "any " + facet;
+            if (null != facet) {
+                switch (facet) {
+                    case FacetConstants.FIELD_SEARCH_SERVICE:
+                        return "Content searchable"; //TODO: make string property
+                    case FacetConstants.FIELD_HAS_PART_COUNT:
+                        return "Collection records"; //TODO: make string property
+                    default:
+                        return "any " + facet;
+                }
+            }
+            return "";
         }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html

@@ -31 +31 @@
                             <label for="onlyfcs">Only include resources that support content search</label>
                         </li>
-                        <!--                            
                         <li>
-                            <input type="checkbox" id="onlymdformat"/>
-                            <label for="onlyfcs">Only include resources described with</label>
-                            <select>
-                                <option>CMDI</option>
-                                <option>OLAC</option>
-                            </select>
+                            <input wicket:id="collection" type="checkbox" id="onlycollections"/>
+                            <label for="onlycollections">Only include collection resources</label>
                         </li>
-                        -->
                     </ul>
                     <input type="submit" value="Apply" class="nonjsfallback" />

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
+import com.google.common.collect.ImmutableSet;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
@@ -25 +26 @@
 import eu.clarin.cmdi.vlo.wicket.model.ToggleModel;
 import eu.clarin.cmdi.vlo.wicket.panels.ExpandablePanel;
+import java.util.Collection;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
@@ -43 +45 @@
 public abstract class AdvancedSearchOptionsPanel extends ExpandablePanel<QueryFacetsSelection> {
 
+    /**
+     * The fields that this panel provides options for
+     */
+    public final static Collection<String> OPTIONS_FIELDS = ImmutableSet.of(
+            FacetConstants.FIELD_HAS_PART_COUNT,
+            FacetConstants.FIELD_SEARCH_SERVICE);
+
     public AdvancedSearchOptionsPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
+        final Form options = new Form("options");
 
-        // create a model for the selection state for the FCS facet
-        final IModel<FacetSelection> fcsFacetModel = new FacetSelectionModel(model, FacetConstants.FIELD_SEARCH_SERVICE);
+        final CheckBox fcsCheck = createFieldNotEmptyOption("fcs", FacetConstants.FIELD_SEARCH_SERVICE);
+        options.add(fcsCheck);
+        final CheckBox collectionCheck = createFieldNotEmptyOption("collection", FacetConstants.FIELD_HAS_PART_COUNT);
+        options.add(collectionCheck);
+        add(options);
+    }
+
+    private CheckBox createFieldNotEmptyOption(String id, String fieldName) {
+        // create a model for the selection state of the facet
+        final IModel<FacetSelection> facetModel = new FacetSelectionModel(getModel(), fieldName);
         // wrap in a toggle model that allows switching between a null selection and a 'not empty' selection
-        final ToggleModel<FacetSelection> toggleModel = new ToggleModel<FacetSelection>(fcsFacetModel, null, new FacetSelection(FacetSelectionType.NOT_EMPTY));
+        final ToggleModel<FacetSelection> toggleModel = new ToggleModel<>(facetModel, null, new FacetSelection(FacetSelectionType.NOT_EMPTY));
 
-        final Form options = new Form("options");
-        final CheckBox fcsCheck = new CheckBox("fcs", toggleModel);
-        fcsCheck.add(new OnChangeAjaxBehavior() {
+        final CheckBox checkBox = new CheckBox(id, toggleModel);
+        checkBox.add(new OnChangeAjaxBehavior() {
 
             @Override
@@ -60 +77 @@
             }
         });
-        options.add(fcsCheck);
-        add(options);
-
         // should initially be epxanded if one of the options was selected
         if (toggleModel.getObject()) {
             getExpansionModel().setObject(ExpansionState.EXPANDED);
         }
+        return checkBox;
     }