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

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
-import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import java.util.List;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
+
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 
 /**
@@ -41 +44 @@
     private final IModel<QueryFacetsSelection> selectionModel;
     private final int valueLimit;
+    
+    
+    /**
+     * now we are returning all facets and model is shared between facetValuesPanel and FacetsPagePanel
+    *
+    * @param service service to use for facet field retrieval
+    * @param facets facets to include
+    * @param selectionModel model that provides current query/selection
+    */
+    public FacetFieldsModel(FacetFieldsService service, List<String> facets, IModel<QueryFacetsSelection> selectionModel) {
+        this(service, facets, selectionModel, -1);
+    }
 
     /**
@@ -56 +71 @@
         this.valueLimit = valueLimit;
     }
+    
+    
+
 
     @Override
@@ -67 +85 @@
         selectionModel.detach();
     }
+    
+    public FacetField getFacetField(String facetName){
+        List<FacetField> facetList = getObject();
+        if(facetList != null)
+                for(FacetField facet: facetList)
+                        if(facet.getName().equals(facetName))
+                                return removeSelected(facet, selectionModel.getObject().getSelectionValues(facetName));
+        
+        return null;
+    }
+    
+    private FacetField removeSelected(FacetField facetField, FacetSelection selection){
+        FacetField filtered = new FacetField(facetField.getName());
+        if(selection != null)
+                for(FacetField.Count value: facetField.getValues())
+                        if(selection.getValues().contains(value.getName()))
+                                continue;
+                        else
+                                filtered.add(value.getName(), value.getCount());
+        else
+                filtered = facetField;
+        
+        return filtered;
+    }
 
 }