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

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

@@ -22 +22 @@
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -38 +39 @@
  * @author twagoo
  */
-public class FacetFieldModel extends LoadableDetachableModel<FacetField> {
+public class FacetFieldModel extends AbstractReadOnlyModel<FacetField> {
 
-    //todo: can probably be made more efficient/elegant than wrapping fields model
     private final FacetFieldsModel fieldsModel;
+    private final String facetName;
     
-    /**
-     *
-     * @param facetField facet field to provide
-     * @param selectionModel model that provides current query/selection
-     */
-    public FacetFieldModel(FacetFieldsService service, FacetField facetField, IModel<QueryFacetsSelection> selectionModel) {
-        super(facetField);
-        fieldsModel = new FacetFieldsModel(service, Collections.singletonList(facetField.getName()), selectionModel, -1);
-    }
-
+    
     /**
      *
@@ -59 +51 @@
      * @param selectionModel model that provides current query/selection
      */
-    public FacetFieldModel(FacetFieldsService service, String facet, IModel<QueryFacetsSelection> selectionModel, int valueLimit) {
-        fieldsModel = new FacetFieldsModel(service, Collections.singletonList(facet), selectionModel, valueLimit);
+    public FacetFieldModel(String facet, FacetFieldsService service, IModel<QueryFacetsSelection> selectionModel) {
+        this(facet, new FacetFieldsModel(service, Collections.singletonList(facet), selectionModel, -1));
+    }
+    
+    public FacetFieldModel(String facetName, FacetFieldsModel fieldsModel){
+        this.fieldsModel = fieldsModel;
+        this.facetName = facetName;
     }
 
     @Override
-    protected FacetField load() {
-        final List<FacetField> fieldsList = fieldsModel.getObject();
-        if (fieldsList == null || fieldsList.isEmpty()) {
-            return null;
-        } else {
-            return fieldsList.get(0);
-        }
+    public FacetField getObject() {
+        return fieldsModel.getFacetField(facetName);
     }
 
-    @Override
-    public void detach() {
-        super.detach();
-        fieldsModel.detach();
+    
+    public void detachFacetFieldsModel(){
+        fieldsModel.detach();
     }
+
+
 }