Changeset 4511

Timestamp:

02/13/14 16:16:28 (10 years ago)

Author:

twagoo

Message:

implemented solr query factory, added optional textual query to model

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/components/FacetsPanel.java (modified) (3 diffs)
• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/model (added)
• main/java/eu/clarin/cmdi/vlo/model/FacetSelectionModel.java (added)
• main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java (added)
• main/java/eu/clarin/cmdi/vlo/service/FacetFieldsService.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/SolrQueryFactory.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/service/impl/FacetFieldsDataProvider.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetFieldsService.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImpl.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/pages/TestFacetedSearchPage.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetsPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.impl.FacetFieldsDataProvider;
+import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -25 +27 @@
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -36 +39 @@
     @SpringBean
     private FacetFieldsService facetFieldsService;
-    
-    public FacetsPanel(String id, ListModel<FacetSelection> model) {
+
+    public FacetsPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
 
-        final IDataProvider<FacetField> provider = new FacetFieldsDataProvider(facetFieldsService, model);
+        final IDataProvider<FacetField> provider = new FacetFieldsDataProvider(facetFieldsService, 
+                new PropertyModel<List<FacetSelection>>(model, "selection"),
+                new PropertyModel<String>(model, "query"));
         add(new DataView<FacetField>("facets", provider) {
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -73 +73 @@
     @Bean
     public SolrQueryFactory queryFactory() {
-        return new SolrQueryFactoryImpl();
+        return new SolrQueryFactoryImpl(vloConfig());
     }
     

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -4 +4 @@
 import eu.clarin.cmdi.vlo.pojo.Facet;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.Arrays;
 import java.util.Collections;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.model.Model;
 
 public class FacetedSearchPage extends WebPage {
@@ -16 +17 @@
     public FacetedSearchPage(final PageParameters parameters) {
         super(parameters);
-        final FacetSelection languageSelection = new FacetSelection(new Facet("Language"), Collections.singleton("Dutch"));
-        final FacetSelection typeSelection = new FacetSelection(new Facet("Resource type"), Collections.<String>emptySet());
 
-        add(new FacetsPanel("facets",
-                new ListModel<FacetSelection>(
-                        Arrays.asList(languageSelection, typeSelection)
-                )));
+        final FacetSelection languageSelection = new FacetSelection(new Facet("language"), Collections.singleton("Dutch"));
+
+        final QueryFacetsSelection selection = new QueryFacetsSelection(Arrays.asList(languageSelection));
+
+        add(new FacetsPanel("facets", new Model<QueryFacetsSelection>(selection)));
     }
 }

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

@@ -39 +39 @@
     }
 
-    public Collection getValue() {
+    public Collection<String> getValue() {
         return values;
     }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/FacetFieldsService.java

@@ -28 +28 @@
 public interface FacetFieldsService {
     
-    List<FacetField> getFacetFields(List<FacetSelection> selection);
+    List<FacetField> getFacetFields(List<FacetSelection> selection, String query);
     
     long getFacetFieldCount();

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/SolrQueryFactory.java

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package eu.clarin.cmdi.vlo.service;
 
@@ -28 +27 @@
 public interface SolrQueryFactory {
 
-    SolrQuery createQuery(List<FacetSelection> selection);
-    
+    SolrQuery createFacetQuery(List<FacetSelection> selection, String query);
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/FacetFieldsDataProvider.java

@@ -25 +25 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.model.util.ListModel;
 
 /**
@@ -34 +33 @@
 
     private final FacetFieldsService facetFieldService;
-    private final ListModel<FacetSelection> selectionModel;
+    private final IModel<List<FacetSelection>> selectionModel;
+    private final IModel<String> searchQuery;
 
-    public FacetFieldsDataProvider(FacetFieldsService facetFieldService, ListModel<FacetSelection> selectionModel) {
+    public FacetFieldsDataProvider(FacetFieldsService facetFieldService, IModel<List<FacetSelection>> selectionModel, IModel<String> searchQuery) {
         this.facetFieldService = facetFieldService;
         this.selectionModel = selectionModel;
+        this.searchQuery = searchQuery;
     }
 
     @Override
     public Iterator<? extends FacetField> iterator(long first, long count) {
-        List<FacetField> facets = facetFieldService.getFacetFields(selectionModel.getObject());
+        List<FacetField> facets = facetFieldService.getFacetFields(selectionModel.getObject(), searchQuery.getObject());
         return facets.listIterator((int) first);
     }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrFacetFieldsService.java

@@ -40 +40 @@
 
     @Override
-    public List<FacetField> getFacetFields(List<FacetSelection> selection) {
-        return searchResultsDao.getFacets(queryFatory.createQuery(selection));
+    public List<FacetField> getFacetFields(List<FacetSelection> selection, String query) {
+        return searchResultsDao.getFacets(queryFatory.createFacetQuery(selection, query));
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImpl.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
+import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.service.SolrQueryFactory;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import java.util.ArrayList;
 import java.util.List;
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.util.ClientUtils;
 
 /**
@@ -28 +32 @@
 public class SolrQueryFactoryImpl implements SolrQueryFactory {
 
-    @Override
-    public SolrQuery createQuery(List<FacetSelection> selection) {
-        throw new UnsupportedOperationException();
+    private static final String SOLR_SEARCH_ALL = "*:*";
+    private final VloConfig config;
+
+    public SolrQueryFactoryImpl(VloConfig config) {
+        this.config = config;
     }
 
+    @Override
+    public SolrQuery createFacetQuery(List<FacetSelection> selections, String queryString) {
+        SolrQuery query = getDefaultFacetQuery();
+
+        if (queryString == null) {
+            query.setQuery(SOLR_SEARCH_ALL);
+        } else {
+            query.setQuery(ClientUtils.escapeQueryChars(queryString));
+        }
+
+        if (selections != null) {
+            final List<String> encodedQueries = new ArrayList(selections.size());
+            for (FacetSelection selection : selections) {
+                String facet = selection.getFacet().getName();
+                for (String value : selection.getValue()) {
+                    encodedQueries.add(String.format("%s:%s", facet, ClientUtils.escapeQueryChars(value)));
+                }
+            }
+            query.setFilterQueries(encodedQueries.toArray(new String[encodedQueries.size()]));
+        }
+        return query;
+    }
+
+    private SolrQuery getDefaultFacetQuery() {
+        SolrQuery result = new SolrQuery();
+        result.setRows(10);
+        result.setStart(0);
+        result.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID, FacetConstants.FIELD_DESCRIPTION);
+        result.setFacet(true);
+        result.setFacetMinCount(1);
+        result.addFacetField(config.getFacetFields());
+        return result;
+    }
 }

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/pages/TestFacetedSearchPage.java

@@ -21 +21 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import static org.hamcrest.core.AnyOf.*;
 
 /**
@@ -66 +68 @@
         mockery.checking(new Expectations() {
             {
-                oneOf(facetFieldsService).getFacetFieldCount();
+                atLeast(1).of(facetFieldsService).getFacetFieldCount();
                 will(returnValue(2L));
-                oneOf(facetFieldsService).getFacetFields(with(any(List.class)));
+                oneOf(facetFieldsService).getFacetFields(with(any(List.class)), with(anyOf(aNull(String.class), any(String.class))));
                 will(returnValue(Arrays.asList(new FacetField("language"), new FacetField("resource class"))));
             }