Changeset 6813

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.

Location:

vlo/trunk/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/pojo/FacetFieldSelection.java (deleted)
• main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetExpansionStateModel.java (modified) (5 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModel.java (modified) (3 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldSelectionModel.java (modified) (6 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldsModel.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/model/FacetNamesModel.java (copied) (copied from vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/FacetNamesModel.java)
• main/java/eu/clarin/cmdi/vlo/wicket/model/SelectionModel.java (copied) (copied from vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SelectionModel.java)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/AllFacetValuesPage.java (modified) (5 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (6 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/ExpandablePanel.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/SingleFacetPanel.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java (modified) (3 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java (modified) (7 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java (modified) (7 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java (modified) (5 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java (modified) (5 diffs)
• main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) (1 diff)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo;
 
-import eu.clarin.cmdi.vlo.service.FacetDescriptionService;
-import eu.clarin.cmdi.vlo.config.VloConfig;
-import eu.clarin.cmdi.vlo.service.PermalinkService;
-import eu.clarin.cmdi.vlo.service.XmlTransformationService;
-import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
-import eu.clarin.cmdi.vlo.wicket.pages.AboutPage;
-import eu.clarin.cmdi.vlo.wicket.pages.HelpPage;
-import eu.clarin.cmdi.vlo.wicket.pages.AllFacetValuesPage;
-import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
-import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
-import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
-import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
-import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+
 import javax.inject.Inject;
+
 import org.apache.wicket.Application;
 import org.apache.wicket.markup.html.WebPage;
@@ -29 +18 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+
+import eu.clarin.cmdi.vlo.config.VloConfig;
+import eu.clarin.cmdi.vlo.service.FacetDescriptionService;
+import eu.clarin.cmdi.vlo.service.PermalinkService;
+import eu.clarin.cmdi.vlo.service.XmlTransformationService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
+import eu.clarin.cmdi.vlo.wicket.pages.AboutPage;
+import eu.clarin.cmdi.vlo.wicket.pages.AllFacetValuesPage;
+import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
+import eu.clarin.cmdi.vlo.wicket.pages.HelpPage;
+import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
+import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
+import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
+import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
 
 /**

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -30 +30 @@
 
     private final FacetSelectionType selectionType;
-    private final Collection<String> values;
+    private Collection<String> values;
 
     /**
@@ -77 +77 @@
         return values;
     }
+    
+    public void setValues(Collection<String> values){
+        this.values = values;
+        
+    }
+    
+    public void removeValues(Collection<String> valuesToBeRemoved){
+        if(valuesToBeRemoved != null){
+                for(String val: valuesToBeRemoved){
+                        this.values.remove(val);
+                }
+        }
+    }
+    
 
     public FacetSelection getCopy() {

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java

@@ -122 +122 @@
         }
     }
+    
+    public void addNewFacetValue(String facet, Collection<String> values){
+        FacetSelection curSel = selection.get(facet);
+        if(curSel != null){
+                curSel.setValues(values);
+        }else{
+                curSel = new FacetSelection(values);                    
+        }
+                
+        selectValues(facet, curSel);            
+    }
+    
+    public void removeFacetValue(String facet, Collection<String> valuestoBeRemoved){
+        FacetSelection curSel = selection.get(facet);
+        if (curSel != null){
+                curSel.removeValues(valuestoBeRemoved);                                 
+        }
+        //to remove facet from map if does not have any value
+        selectValues(facet, curSel);
+    }
 
     @Override

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

@@ -30 +30 @@
 public class FacetExpansionStateModel implements IModel<ExpansionState> {
 
-    private final IModel<FacetField> facetModel;
+    private final IModel<String> facetName;
     private final IModel<Map<String, ExpansionState>> expansionStateMapModel;
 
@@ -38 +38 @@
      * @param expansionStateMapModel model that holds the map of expansion states
      */
-    public FacetExpansionStateModel(IModel<FacetField> facetModel, IModel<Map<String, ExpansionState>> expansionStateMapModel) {
-        this.facetModel = facetModel;
+    public FacetExpansionStateModel(IModel<String> facetName, IModel<Map<String, ExpansionState>> expansionStateMapModel) {
+        this.facetName = facetName;
         this.expansionStateMapModel = expansionStateMapModel;
     }
@@ -45 +45 @@
     @Override
     public ExpansionState getObject() {
-        final String facet = facetModel.getObject().getName();
+        final String facet = facetName.getObject();
         final ExpansionState state = expansionStateMapModel.getObject().get(facet);
         if (state == null) {
@@ -56 +56 @@
     @Override
     public void setObject(ExpansionState object) {
-        final String facet = facetModel.getObject().getName();
+        final String facet = facetName.getObject();
         expansionStateMapModel.getObject().put(facet, object);
     }
@@ -62 +62 @@
     @Override
     public void detach() {
-        facetModel.detach();
+        facetName.detach();
         expansionStateMapModel.detach();
     }

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();
     }
+
+
 }

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
-import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
-import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
+
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 
 /**
@@ -34 +35 @@
  * @author twagoo
  */
-public class FacetFieldSelectionModel extends AbstractReadOnlyModel<FacetFieldSelection> implements FacetFieldSelection {
+public class FacetFieldSelectionModel extends AbstractReadOnlyModel<FacetSelection> {
 
     private final IModel<QueryFacetsSelection> selectionModel;
@@ -49 +50 @@
     }
 
-    @Override
+ 
+    //@Override
+        public IModel<FacetField> getFacetFieldAsModel() {
+                return facetFieldModel;
+        }
+    
+    
+    //@Override
     public FacetField getFacetField() {
         return facetFieldModel.getObject();
     }
+    
 
-    @Override
+
+   // @Override
     public List<String> getFacetValues() {
-        final String facetName = getFacetField().getName();
-        final FacetSelection selection = getSelection().getSelectionValues(facetName);
+        final FacetSelection selection = getObject();
         if (selection == null) {
             return Collections.emptyList();
@@ -69 +78 @@
         }
     }
+    
+   
 
-    @Override
+        //@Override
+        public IModel<QueryFacetsSelection> getSelectionAsModel() {
+                return selectionModel;
+        }
+    
+
+    //@Override
     public QueryFacetsSelection getSelection() {
         return selectionModel.getObject();
@@ -76 +93 @@
 
     @Override
-    public FacetFieldSelection getObject() {
-        return this;
+    public FacetSelection getObject() {
+        final String facetName = getFacetField().getName();
+        return getSelection().getSelectionValues(facetName);
     }
 
@@ -90 +108 @@
         return String.format("[Field: %s; Selection: %s]", facetFieldModel.getObject().getName(), selectionModel.getObject().toString());
     }
-    
+
+        
 }

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;
+    }
 
 }

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

vlo/trunk/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;
 
 /**
@@ -48 +51 @@
     private Component navigation;
     private Component searchForm;
+    
+    
+    IModel<List<String>> facetNamesModel;
+    FacetFieldsModel fieldsModel;
+    
+    
 
     public FacetedSearchPage(IModel<QueryFacetsSelection> queryModel) {
         super(queryModel);
+        createModels();
         addComponents();
     }
@@ -60 +70 @@
         final IModel<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
         setModel(queryModel);
+        createModels();
         addComponents();
+    }
+    
+    
+    private void createModels(){
+        facetNamesModel = new FacetNamesModel(vloConfig.getFacetFields());
+        fieldsModel = new FacetFieldsModel(facetFieldsService, facetNamesModel.getObject(), getModel(), -1);
     }
 
@@ -139 +156 @@
         enclosure.setOutputMarkupId(true);
         if (vloConfig.getCollectionFacet() != null) {
-            final FacetPanel panel = new SingleFacetPanel("collectionsFacet", getModel(), vloConfig.getCollectionFacet(), facetFieldsService, 3) {
+            final FacetPanel panel = new SingleFacetPanel("collectionsFacet", vloConfig.getCollectionFacet(), getModel(), facetFieldsService, 3) {
 
                 @Override
@@ -158 +175 @@
 
     private Panel createFacetsPanel(final String id) {
-        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 FacetsPanel panel = new FacetsPanel(id, facetNamesModel, fieldsModel, getModel()) {
 
             @Override
@@ -172 +188 @@
 
     private void updateSelection(AjaxRequestTarget target) {
+        
+        //detach facetFieldsModel when selection is changed
+        fieldsModel.detach();
+        
         // selection changed, update facets and search results
         if (target != null) { // null if JavaScript disabled

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

@@ -107 +107 @@
         // collection facet is optional...
         if (vloConfig.getCollectionFacet() != null) {
-            return new SingleFacetPanel(id, getModel(), vloConfig.getCollectionFacet(), facetFieldsService, 3) {
+            return new SingleFacetPanel(id, vloConfig.getCollectionFacet(), getModel(), facetFieldsService, 3) {
 
                 @Override

vlo/trunk/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/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/SingleFacetPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels;
 
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldSelectionModel;
 import eu.clarin.cmdi.vlo.wicket.panels.search.FacetPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 
 /**
@@ -31 +31 @@
  */
 public abstract class SingleFacetPanel extends FacetPanel {
+        
+        //public FacetPanel(String id, IModel<String> facetName, IModel<FacetFieldSelection> selectionModel, IModel<ExpansionState> expansionState, int subListSize) {
 
-    public SingleFacetPanel(String id, IModel<QueryFacetsSelection> queryModel, String facetName, FacetFieldsService facetFieldsService, int subListSize) {
+    public SingleFacetPanel(String id, String facetName, IModel<QueryFacetsSelection> queryModel,  FacetFieldsService facetFieldsService, int subListSize) {
         //TODO: Limit to number of items shown while keeping 'more' function?
-        super(id, new FacetFieldSelectionModel(new FacetFieldModel(facetFieldsService, facetName, queryModel, -1), queryModel), Model.of(ExpansionState.COLLAPSED), subListSize);
+        super(id, 
+                        new Model(facetName), 
+                        new FacetFieldModel(facetName, facetFieldsService, queryModel), 
+                        queryModel, 
+                                Model.of(ExpansionState.COLLAPSED),
+                                subListSize);
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

@@ -28 +28 @@
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
 import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
+
+import java.util.Collection;
 import java.util.Collections;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -143 +145 @@
                         // call callback
                         onValuesSelected(
-                                item.getModelObject().getFacetField().getName(),
                                 // for now only single values can be selected
-                                new FacetSelection(Collections.singleton(item.getModelObject().getName())),
+                                        Collections.singleton(item.getModelObject().getName()),
                                 target);
                     }
@@ -256 +257 @@
      * Callback triggered when values have been selected on this facet
      *
-     * @param facet name of the facet this panel represents
      * @param values selected values
      * @param target Ajax target allowing for a partial update. May be null
      * (fallback)!
      */
-    protected abstract void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target);
+    protected abstract void onValuesSelected(Collection<String> values, AjaxRequestTarget target);
 
 }

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldDescriptionModel;
-import eu.clarin.cmdi.vlo.pojo.ExpansionState;
-import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
-import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
-import eu.clarin.cmdi.vlo.wicket.panels.ExpandablePanel;
 import java.util.Collection;
-import java.util.HashSet;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -31 +24 @@
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import eu.clarin.cmdi.vlo.pojo.ExpansionState;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.model.SelectionModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldDescriptionModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
+import eu.clarin.cmdi.vlo.wicket.panels.ExpandablePanel;
 
 /**
@@ -43 +42 @@
  * @author twagoo
  */
-public abstract class FacetPanel extends ExpandablePanel<FacetFieldSelection> {
+public abstract class FacetPanel extends ExpandablePanel<String> {
     private final static Logger logger = LoggerFactory.getLogger(FacetPanel.class);
-
-    private final IModel<ExpansionState> expansionStateModel;
 
     private final SelectedFacetPanel selectedFacetPanel;
     private final FacetValuesPanel facetValuesPanel;
 
-    public FacetPanel(String id, IModel<FacetFieldSelection> selectionModel, IModel<ExpansionState> expansionState) {
-        this(id, selectionModel, expansionState, 0);
+    public FacetPanel(String id, IModel<String> facetNameModel, IModel<FacetField> facetFieldModel, final IModel<QueryFacetsSelection> selectionModel, IModel<ExpansionState> expansionState) {
+        this(id, facetNameModel, facetFieldModel, selectionModel, expansionState, 0);
     }
 
-    public FacetPanel(String id, IModel<FacetFieldSelection> selectionModel, IModel<ExpansionState> expansionState, int subListSize) {
-        super(id, selectionModel, expansionState);
-        this.expansionStateModel = expansionState;
+    public FacetPanel(String id, IModel<String> facetNameModel, IModel<FacetField> facetFieldModel, final IModel<QueryFacetsSelection> selectionModel, IModel<ExpansionState> expansionState, int subListSize) {
+        super(id, facetNameModel, expansionState);
 
         // panel showing values for selection
-        facetValuesPanel = createFacetValuesPanel("facetValues", subListSize);
+        facetValuesPanel = createFacetValuesPanel("facetValues", facetNameModel.getObject(), facetFieldModel, selectionModel, subListSize);
         add(facetValuesPanel);
 
         // panel showing current selection, allowing for deselection
-        selectedFacetPanel = createSelectedFacetPanel("facetSelection");
+        selectedFacetPanel = createSelectedFacetPanel("facetSelection", facetNameModel.getObject(), selectionModel);
         add(selectedFacetPanel);
     }
@@ -70 +66 @@
     @Override
     protected Label createTitleLabel(String id) {
-        final IModel<String> facetNameModel = new PropertyModel<>(getModel(), "facetField.name");
-        final Label label = new Label(id, new SolrFieldNameModel(facetNameModel));
-        label.add(new AttributeAppender("title", new SolrFieldDescriptionModel(facetNameModel)));
+        final Label label = new Label(id, new SolrFieldNameModel(getModel()));
+        label.add(new AttributeAppender("title", new SolrFieldDescriptionModel(getModel())));
         return label;
     }
@@ -79 +74 @@
     protected void onConfigure() {
         super.onConfigure();
-
-        final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
+        
+        final boolean valuesSelected = !selectedFacetPanel.getModelObject().isEmpty();
         facetValuesPanel.setVisible(!valuesSelected);
         selectedFacetPanel.setVisible(valuesSelected);
-
-        // hide this entire panel is no values are selectable
-        setVisible(!isHideIfNoValues() || valuesSelected || getModelObject().getFacetField().getValueCount() > 0);
+        
+        
+        // hide this entire panel if nothing is selected or there is nothing to be selected
+        setVisible(!isHideIfNoValues() || valuesSelected || facetValuesPanel.getModelObject().getValueCount() > 0);
     }
+    
 
     /**
@@ -97 +94 @@
     }
 
-    private FacetValuesPanel createFacetValuesPanel(String id, int subListSize) {
-        return new FacetValuesPanel(id,
-                new PropertyModel<FacetField>(getModel(), "facetField"),
-                new PropertyModel<QueryFacetsSelection>(getModel(), "selection"), subListSize) {
+    private FacetValuesPanel createFacetValuesPanel(String id, final String facetName, IModel<FacetField> facetFieldModel, final IModel<QueryFacetsSelection> selectionModel, int subListSize) {
+        return new FacetValuesPanel(id, facetFieldModel, selectionModel, subListSize) {
                     @Override
-                    public void onValuesSelected(String facet, FacetSelection value, AjaxRequestTarget target) {
+                    public void onValuesSelected(Collection<String> values, AjaxRequestTarget target) {
                         // A value has been selected on this facet's panel, update the model!
-                        FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
-                        if (target != null) {
+                        selectionModel.getObject().addNewFacetValue(facetName, values);
+                       
+                        if (target != null) {
                             // reload entire page for now
                             selectionChanged(target);
@@ -113 +109 @@
     }
 
-    private SelectedFacetPanel createSelectedFacetPanel(String id) {
-        return new SelectedFacetPanel(id, getModel()) {
+    private SelectedFacetPanel createSelectedFacetPanel(String id, final String facetName, final IModel<QueryFacetsSelection> selectionModel) {
+        return new SelectedFacetPanel(id, facetName, new SelectionModel(facetName, selectionModel)) {
             @Override
-            public void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target) {
-                final QueryFacetsSelection selection = getModelObject().getSelection();
+            public void onValuesUnselected(Collection<String> valuesRemoved, AjaxRequestTarget target) {
+                // Values have been removed, calculate remainder
+                selectionModel.getObject().removeFacetValue(facetName, valuesRemoved);
 
-                // Values have been removed, calculate remainder
-                final FacetSelection facetSelection = selection.getSelectionValues(facet);
-                final Collection<String> currentSelection = facetSelection.getValues();
-                final Collection<String> newSelection = new HashSet<String>(currentSelection);
-                newSelection.removeAll(valuesRemoved);
-
-                // Update model (keep selection type)
-                selection.selectValues(facet, new FacetSelection(facetSelection.getSelectionType(), newSelection));
-
-                // collapse after removal
-                // TODO: should be removed, but then list of values
-                // does not seem to update correctly
-                expansionStateModel.setObject(ExpansionState.COLLAPSED);
-
+             // collapse after removal
+             // TODO: should be removed, but then list of values
+             // does not seem to update correctly
+             expansionModel.setObject(ExpansionState.COLLAPSED);
+                
                 if (target != null) {
                     // reload entire page for now

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

@@ -25 +25 @@
 import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
 import eu.clarin.cmdi.vlo.wicket.provider.PartitionedDataProvider;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
 import eu.clarin.cmdi.vlo.wicket.pages.AllFacetValuesPage;
@@ -73 +74 @@
     private final int subListSize;
     private final IModel<String> fieldNameModel;
-
+    
     @SpringBean
     private FieldValueConverterProvider fieldValueConverterProvider;
@@ -203 +204 @@
                 // call callback
                 onValuesSelected(
-                        item.getModelObject().getFacetField().getName(),
                         // for now only single values can be selected
-                        new FacetSelection(Collections.singleton(item.getModelObject().getName())),
+                                Collections.singleton(item.getModelObject().getName()),
                         target);
             }
@@ -243 +243 @@
                 super.onConfigure();
                 // only show if there actually are more values!
-                setVisible(getModel().getObject().getValueCount() > MAX_NUMBER_OF_FACETS_TO_SHOW);
+                setVisible(getModelObject().getValueCount() > MAX_NUMBER_OF_FACETS_TO_SHOW);
             }
 
@@ -271 +271 @@
 
             @Override
-            protected void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target) {
+            protected void onValuesSelected(Collection<String> values, AjaxRequestTarget target) {
                 if (target != null) {
                     // target can be null if selection link was opened in a new tab
                     window.close(target);
                 }
-                FacetValuesPanel.this.onValuesSelected(facet, values, target);
+                FacetValuesPanel.this.onValuesSelected(values, target);
             }
         };
@@ -289 +289 @@
         filterModel.detach();
     }
+    
 
     /**
@@ -298 +299 @@
      * (fallback)!
      */
-    protected abstract void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target);
-
+    protected abstract void onValuesSelected(Collection<String> values, AjaxRequestTarget target);
+    
     @Override
     protected void onBeforeRender() {

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.JavaScriptResources;
-import eu.clarin.cmdi.vlo.pojo.ExpansionState;
-import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
-import eu.clarin.cmdi.vlo.wicket.model.FacetExpansionStateModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldSelectionModel;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.solr.client.solrj.response.FacetField;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -40 +34 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.util.MapModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import eu.clarin.cmdi.vlo.JavaScriptResources;
+import eu.clarin.cmdi.vlo.pojo.ExpansionState;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.wicket.model.FacetExpansionStateModel;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
 
 /**
@@ -50 +50 @@
  * @author twagoo
  */
-public abstract class FacetsPanel extends GenericPanel<List<FacetField>> {
+public abstract class FacetsPanel extends GenericPanel<List<String>> {
 
-    @SpringBean
-    private FacetFieldsService facetFieldsService;
     private MapModel<String, ExpansionState> expansionModel;
 
@@ -64 +62 @@
      * 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 FacetFieldsModel fieldsModel, final IModel<QueryFacetsSelection> selectionModel) {
+        super(id, facetNamesModel);
 
         final Map<String, ExpansionState> expansionStateMap = new HashMap<String, ExpansionState>();
         expansionModel = new MapModel<String, ExpansionState>(expansionStateMap);
-
-        final ListView<FacetField> facetsView = new ListView<FacetField>("facets", facetsModel) {
+        
+        final ListView<String> facetsView = new ListView<String>("facets", facetNamesModel) {
 
             @Override
-            protected void populateItem(ListItem<FacetField> item) {
-                // Create a facet field model which does a lookup by name,
+            protected void populateItem(ListItem<String> item) {
+                // Create a facet field model which does a lookup by name,
                 // making it dynamic in case the selection and therefore
                 // set of available values changes
-                final IModel<FacetField> facetFieldModel = new FacetFieldModel(facetFieldsService, item.getModelObject(), selectionModel);
                 item.add(
-                        new FacetPanel("facet",
-                                new FacetFieldSelectionModel(facetFieldModel, selectionModel),
-                                new FacetExpansionStateModel(facetFieldModel, expansionModel)) {
+                        new FacetPanel("facet", 
+                                        item.getModel(),
+                                        new FacetFieldModel(item.getModelObject(), fieldsModel), 
+                                selectionModel,
+                                new FacetExpansionStateModel(item.getModel(), expansionModel)) {
 
                             @Override
@@ -139 +138 @@
     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);
         }
     }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
-import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
-import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
@@ -27 +28 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.Model;
+
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.wicket.components.FieldValueLabel;
 
 /**
@@ -36 +41 @@
  * @author twagoo
  */
-public abstract class SelectedFacetPanel extends GenericPanel<FacetFieldSelection> {
+public abstract class SelectedFacetPanel extends GenericPanel<FacetSelection> {
 
-    public SelectedFacetPanel(String id, final IModel<FacetFieldSelection> model) {
+    public SelectedFacetPanel(String id, String facetName, final IModel<FacetSelection> model) {
         super(id, model);
 
         // Add removers for all selected values for collapsed state
-        add(createSelectionRemovers("facetValueRemover"));
+        add(createSelectionRemovers("facetValueRemover", facetName));
         // Add selected items to expanded state
-        add(createSelectionRemovers("selectedItem"));
+        add(createSelectionRemovers("selectedItem", facetName));
     }
-
-    private ListView<String> createSelectionRemovers(String id) {
+        
+    private ListView<String> createSelectionRemovers(String id, String facetName) {
         // Model of the list of selected values in this facet
-        final PropertyModel<List<String>> propertyModel = new PropertyModel<List<String>>(getModel(), "facetValues");
-        final PropertyModel<String> fieldNameModel = new PropertyModel(getModel(), "facetField.name");
+        
+        List<String> selectedValues;
+                if (getModelObject().getValues() != null)
+                        selectedValues = new CopyOnWriteArrayList<String>(getModelObject().getValues());
+                else
+                        selectedValues = Collections.emptyList();
+                
+                
+        final IModel<List<String>> propertyModel = new AbstractReadOnlyModel<List<String>>() {
+                
+                        @Override
+                        public List<String> getObject() {
+                                return new ArrayList(SelectedFacetPanel.this.getModelObject().getValues());
+                        }
+                
+                };
+                final IModel<String> fieldNameModel = new Model<String>(facetName);
+        //final PropertyModel<List<String>> propertyModel= new PropertyModel<List<String>>(getModel(), "facetValues");
+        //final PropertyModel<String> fieldNameModel = new PropertyModel(getModel(), "facetField.name");
+        
+        
         // Repeating container of value + unselection links
         final ListView<String> listView = new ListView<String>(id, propertyModel) {
@@ -79 +103 @@
      * (fallback)!
      */
-    protected abstract void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target);
+    protected abstract void onValuesUnselected(Collection<String> valuesRemoved, AjaxRequestTarget target);
 
     public class RemoveLink extends IndicatingAjaxFallbackLink {
@@ -94 +118 @@
             // Remove a single value
             // Call callback
-            onValuesUnselected(
-                    SelectedFacetPanel.this.getModelObject().getFacetField().getName(),
-                    Collections.singleton(valueModel.getObject()), target);
+            onValuesUnselected(Collections.singleton(valueModel.getObject()), target);
         }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
-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.PageParametersConverter;
-import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
-import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldDescriptionModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
-import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
-import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
+import java.util.Collection;
+
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -44 +35 @@
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+
+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.PageParametersConverter;
+import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.solr.SolrDocumentService;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldDescriptionModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
+import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
+import eu.clarin.cmdi.vlo.wicket.pages.SimpleSearchPage;
 
 /**
@@ -125 +128 @@
 
                 @Override
-                protected void onValuesSelected(String facet, FacetSelection values, AjaxRequestTarget target) {
+                protected void onValuesSelected(Collection<String> values, AjaxRequestTarget target) {
                     // value selected, make a new selection (in this panel we do not want to change the existing selection)...
                     final QueryFacetsSelection newSelection = selectionModel.getObject().getCopy();
-                    newSelection.selectValues(facet, values);
+                    newSelection.selectValues(getModelObject().getName(), new FacetSelection(values));
                     // ...then submit to search page
                     setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(newSelection));

vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.solr.impl;
 
-import com.google.common.collect.ImmutableList;
 import static eu.clarin.cmdi.vlo.FacetConstants.FIELD_COLLECTION;
 import static eu.clarin.cmdi.vlo.FacetConstants.FIELD_COUNTRY;
@@ -23 +22 @@
 import static eu.clarin.cmdi.vlo.FacetConstants.FIELD_ID;
 import static eu.clarin.cmdi.vlo.FacetConstants.FIELD_NAME;
-import eu.clarin.cmdi.vlo.config.VloConfig;
-import eu.clarin.cmdi.vlo.importer.CMDIData;
+import static org.hamcrest.Matchers.equalTo;
+
 import java.io.File;
 import java.util.List;
+
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
@@ -37 +37 @@
 import org.junit.Before;
 import org.junit.Test;
-import static org.hamcrest.Matchers.*;
+
+import com.google.common.collect.ImmutableList;
+
+import eu.clarin.cmdi.vlo.config.VloConfig;
+import eu.clarin.cmdi.vlo.importer.CMDIData;
 
 /**

vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/FacetFieldModelTest.java

@@ -58 +58 @@
     @Test
     public void testGetObject() {
-        final FacetFieldModel instance = new FacetFieldModel(service, "facet4", selectionModel, 20);
+        final FacetFieldModel instance = new FacetFieldModel("facet4", new FacetFieldsModel(service, ImmutableList.of("facet4"), selectionModel, 20));
         
         context.checking(new Expectations() {
@@ -83 +83 @@
     @Test
     public void testGetObjectNotIncluded() {
-        final FacetFieldModel instance = new FacetFieldModel(service, "facet4", selectionModel, 20);
+        final FacetFieldModel instance = new FacetFieldModel("facet4", new FacetFieldsModel(service, ImmutableList.of("facet4"), selectionModel, 20));
 
         context.checking(new Expectations() {

vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java

@@ -60 +60 @@
                 will(returnValue(2L));
                 atLeast(1).of(facetFieldsService).getFacetFields(with(any(QueryFacetsSelection.class)), with(any(List.class)), with(any(Integer.class)));
-                will(returnValue(Arrays.asList(new FacetField("collection"), new FacetField("language"), new FacetField("resource class"))));
+                will(returnValue(Arrays.asList(
+                                new FacetField("languageCode"),
+                                new FacetField("collection"),
+                                new FacetField("resourceClass"),
+                                new FacetField("country"),
+                                new FacetField("modality"),
+                                new FacetField("genre"), 
+                                new FacetField("subject"),
+                                new FacetField("format"),
+                                new FacetField("organisation"),
+                                new FacetField("availability"),
+                                new FacetField("nationalProject"),
+                                new FacetField("keywords"),
+                                new FacetField("dataProvider")
+                )));
 
                 // mock search results