Changeset 6478

Timestamp:

08/19/15 10:12:31 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

reduce number of solr requests

Location:

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

Files:

• service/solr/impl/AbstractSolrQueryFactory.java (modified) (1 diff)
• wicket/panels/ExpandablePanel.java (modified) (1 diff)
• wicket/panels/search/FacetPanel.java (modified) (4 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

@@ -63 +63 @@
                                         filterExpr += " OR ";
                                 filterExpr += encodedQuery;
-                            }
-                            
+                            }                            
                             encodedQueries.add(filterExpr);
                             break;
+                        case NOT:
+                                for (String value : selection.getValues()) {
+                                        encodedQueries.add(createFilterQuery(facetName, value));
+                                }
+                                break;                          
                         default:
                             //TODO: support OR,NOT

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

@@ -39 +39 @@
 public abstract class ExpandablePanel<T> extends GenericPanel<T> {
 
-    private final IModel<ExpansionState> expansionModel;
+    protected final IModel<ExpansionState> expansionModel;
 
     /**

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

@@ -46 +46 @@
     private final static Logger logger = LoggerFactory.getLogger(FacetPanel.class);
 
-    private final IModel<ExpansionState> expansionStateModel;
-
     private final SelectedFacetPanel selectedFacetPanel;
     private final FacetValuesPanel facetValuesPanel;
@@ -57 +55 @@
     public FacetPanel(String id, IModel<FacetFieldSelection> selectionModel, IModel<ExpansionState> expansionState, int subListSize) {
         super(id, selectionModel, expansionState);
-        this.expansionStateModel = expansionState;
 
         // panel showing values for selection
@@ -86 +83 @@
         // hide this entire panel is no values are selectable
         setVisible(!isHideIfNoValues() || valuesSelected || getModelObject().getFacetField().getValueCount() > 0);
+    }
+    
+    @Override
+    protected void onBeforeRender() {
+        final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
+        if(!valuesSelected && expansionModel.getObject() == ExpansionState.COLLAPSED){
+                 facetValuesPanel.setVisible(false); 
+             selectedFacetPanel.setVisible(false);
+        }
+        
+        super.onBeforeRender();
     }
 
@@ -136 +144 @@
                 // TODO: should be removed, but then list of values
                 // does not seem to update correctly
-                expansionStateModel.setObject(ExpansionState.COLLAPSED);
+                expansionModel.setObject(ExpansionState.COLLAPSED);
 
                 if (target != null) {