Changeset 6480

Timestamp:

08/19/15 11:31:02 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

Model of FacetsPanel? is replaced with FacetNamesModel?
components in FacetPanel? are rendered only if state is expanded and smth is selected -> reduces number of SOLR requests

Location:

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• model/FacetNamesModel.java (added)
• pages/FacetedSearchPage.java (modified) (2 diffs)
• panels/search/FacetPanel.java (modified) (2 diffs)
• panels/search/FacetsPanel.java (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
-import eu.clarin.cmdi.vlo.wicket.model.PermaLinkModel;
-import eu.clarin.cmdi.vlo.wicket.panels.SingleFacetPanel;
-import eu.clarin.cmdi.vlo.config.VloConfig;
-import eu.clarin.cmdi.vlo.wicket.panels.search.FacetsPanel;
-import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.PageParametersConverter;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
-import eu.clarin.cmdi.vlo.wicket.panels.search.FacetPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.SearchFormPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.SearchResultsPanel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
-import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.FacetValuesPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.TopLinksPanel;
-import eu.clarin.cmdi.vlo.wicket.panels.search.AdvancedSearchOptionsPanel;
 import java.util.List;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import eu.clarin.cmdi.vlo.config.VloConfig;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
+import eu.clarin.cmdi.vlo.wicket.model.FacetNamesModel;
+import eu.clarin.cmdi.vlo.wicket.model.PermaLinkModel;
+import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.SingleFacetPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.TopLinksPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.AdvancedSearchOptionsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetValuesPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.FacetsPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.SearchFormPanel;
+import eu.clarin.cmdi.vlo.wicket.panels.search.SearchResultsPanel;
 
 /**
@@ -160 +163 @@
         final IModel<QueryFacetsSelection> queryModel = getModel();
         final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel, FacetValuesPanel.MAX_NUMBER_OF_FACETS_TO_SHOW);
-        final FacetsPanel panel = new FacetsPanel(id, facetFieldsModel, queryModel) {
+        final IModel<List<String>> facetNamesModel = new FacetNamesModel(vloConfig.getFacetFields());
+        final FacetsPanel panel = new FacetsPanel(id, facetNamesModel, facetFieldsModel, queryModel) {
 
             @Override

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

@@ -78 +78 @@
 
         final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
-        facetValuesPanel.setVisible(true); 
+        
         selectedFacetPanel.setVisible(valuesSelected);
+        
+        facetValuesPanel.setVisible((!valuesSelected && expansionModel.getObject() == ExpansionState.COLLAPSED)? false : true);        
 
         // hide this entire panel is no values are selectable
@@ -85 +87 @@
     }
     
-    @Override
-    protected void onBeforeRender() {
-        final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
-        if(!valuesSelected && expansionModel.getObject() == ExpansionState.COLLAPSED){
-                 facetValuesPanel.setVisible(false); 
-             selectedFacetPanel.setVisible(false);
-        }
-        
-        super.onBeforeRender();
-    }
 
     /**

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

@@ -50 +50 @@
  * @author twagoo
  */
-public abstract class FacetsPanel extends GenericPanel<List<FacetField>> {
+public abstract class FacetsPanel extends GenericPanel<List<String>> {
 
     @SpringBean
@@ -64 +64 @@
      * selection state
      */
-    public FacetsPanel(final String id, final IModel<List<FacetField>> facetsModel, final IModel<QueryFacetsSelection> selectionModel) {
-        super(id, facetsModel);
+    public FacetsPanel(final String id, final IModel<List<String>> facetNamesModel, final IModel<List<FacetField>> facetsModel, final IModel<QueryFacetsSelection> selectionModel) {
+        super(id, facetNamesModel);
 
         final Map<String, ExpansionState> expansionStateMap = new HashMap<String, ExpansionState>();
@@ -140 +140 @@
     private void setAllFacetsExpansionState(final ExpansionState state) {
         final Map<String, ExpansionState> expansionMap = expansionModel.getObject();
-        for (FacetField facet : getModelObject()) {
-            expansionMap.put(facet.getName(), state);
+        for (String facetName : getModelObject()) {
+            expansionMap.put(facetName, state);
         }
     }