Changeset 6456 for vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java

Timestamp:

08/14/15 12:04:16 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

multi value search for a single facet

File:

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

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java

@@ -81 +81 @@
 
         final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
-        //show both for multi values
-        facetValuesPanel.setVisible(!valuesSelected); 
+        facetValuesPanel.setVisible(true); 
         selectedFacetPanel.setVisible(valuesSelected);
 
@@ -105 +104 @@
                     public void onValuesSelected(String facet, FacetSelection value, AjaxRequestTarget target) {
                         // A value has been selected on this facet's panel, update the model!
-                        FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
+                        FacetPanel.this.getModelObject().getSelection().addNewFacetValue(facet, value);
+                        //FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
                         if (target != null) {
                             // reload entire page for now
@@ -121 +121 @@
 
                 // Values have been removed, calculate remainder
+                
                 final FacetSelection facetSelection = selection.getSelectionValues(facet);
-                final Collection<String> currentSelection = facetSelection.getValues();
-                final Collection<String> newSelection = new HashSet<String>(currentSelection);
-                newSelection.removeAll(valuesRemoved);
+//                final Collection<String> currentSelection = facetSelection.getValues();
+//                final Collection<String> newSelection = new HashSet<String>(currentSelection);
+//                newSelection.removeAll(valuesRemoved);
 
                 // Update model (keep selection type)
-                selection.selectValues(facet, new FacetSelection(facetSelection.getSelectionType(), newSelection));
+//                              selection.selectValues(facet, new FacetSelection(facetSelection.getSelectionType(), newSelection));
+                
+                FacetSelection fSelToRemove = new FacetSelection(facetSelection.getSelectionType(), valuesRemoved);
+                selection.removeFacetValue(facet, fSelToRemove);
 
                 // collapse after removal