Changeset 4963 for vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java

Timestamp:

04/14/14 11:37:03 (10 years ago)

Author:

Twan Goosen

Message:

Refactored QueryFacetSelection?: instead of a collection of strings, it now has a 'FacetSelection?' object for each facet which holds a collection as well as a selection type (which can be AND (default), OR, NOT, or NOT EMPTY).

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java (modified) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.config.VloConfig;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
@@ -24 +25 @@
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
-import java.util.Collection;
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -89 +89 @@
 
                     @Override
-                    protected void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target) {
+                    protected void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target) {
                         // value selected, add to selection model then submit to search page
                         final IModel<QueryFacetsSelection> selectionModel = SimpleSearchBrowsePanel.this.getModel();