Changeset 6813 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/AllFacetValuesPage.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/pages/AllFacetValuesPage.java (modified) (5 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/AllFacetValuesPage.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
-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.FacetParameterMapper;
-import eu.clarin.cmdi.vlo.service.PageParametersConverter;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.AllFacetValuesPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
+import java.util.Collection;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.RestartResponseException;
@@ -39 +31 @@
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.string.StringValue;
+
+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.FacetParameterMapper;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
+import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.AllFacetValuesPanel;
 
 /**
@@ -73 +76 @@
         if (vloConfig.getAllFacetFields().contains(facet)) {
             // create a new model so that all values will be retrieved
-            setModel(new FacetFieldModel(facetFieldsService, facet, selectionModel, -1)); // gets all facet values
+                
+            setModel(new FacetFieldModel(facet, facetFieldsService, selectionModel)); // gets all facet values
         }
         if (getModelObject() == null) {
@@ -97 +101 @@
 
             @Override
-            protected void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target) {
+            protected void onValuesSelected(Collection<String> values, AjaxRequestTarget target) {
                 // Create updated selection state
                 final QueryFacetsSelection newSelection;
@@ -105 +109 @@
                     newSelection = new QueryFacetsSelection();
                 }
-                newSelection.selectValues(facet, values);
+                newSelection.selectValues(getModelObject().getName(), new FacetSelection(values));
 
                 // Redirect to search page with updated model