Changeset 6813 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

Timestamp:

11/17/15 11:55:14 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

#795 VLO web-app generates unnecessary requests. The idea behind is to fire SOLR query only when selection is changed.

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java (modified) (7 diffs)

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

@@ -25 +25 @@
 import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
 import eu.clarin.cmdi.vlo.wicket.provider.PartitionedDataProvider;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
 import eu.clarin.cmdi.vlo.wicket.pages.AllFacetValuesPage;
@@ -73 +74 @@
     private final int subListSize;
     private final IModel<String> fieldNameModel;
-
+    
     @SpringBean
     private FieldValueConverterProvider fieldValueConverterProvider;
@@ -203 +204 @@
                 // call callback
                 onValuesSelected(
-                        item.getModelObject().getFacetField().getName(),
                         // for now only single values can be selected
-                        new FacetSelection(Collections.singleton(item.getModelObject().getName())),
+                                Collections.singleton(item.getModelObject().getName()),
                         target);
             }
@@ -243 +243 @@
                 super.onConfigure();
                 // only show if there actually are more values!
-                setVisible(getModel().getObject().getValueCount() > MAX_NUMBER_OF_FACETS_TO_SHOW);
+                setVisible(getModelObject().getValueCount() > MAX_NUMBER_OF_FACETS_TO_SHOW);
             }
 
@@ -271 +271 @@
 
             @Override
-            protected void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target) {
+            protected void onValuesSelected(Collection<String> values, AjaxRequestTarget target) {
                 if (target != null) {
                     // target can be null if selection link was opened in a new tab
                     window.close(target);
                 }
-                FacetValuesPanel.this.onValuesSelected(facet, values, target);
+                FacetValuesPanel.this.onValuesSelected(values, target);
             }
         };
@@ -289 +289 @@
         filterModel.detach();
     }
+    
 
     /**
@@ -298 +299 @@
      * (fallback)!
      */
-    protected abstract void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target);
-
+    protected abstract void onValuesSelected(Collection<String> values, AjaxRequestTarget target);
+    
     @Override
     protected void onBeforeRender() {