Changeset 4566

Timestamp:

02/25/14 14:34:29 (10 years ago)

Author:

twagoo

Message:

separated document query factory from facet query factory (both in interface and implementation)

Location:

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

Files:

• config/VloSpringConfig.java (modified) (3 diffs)
• service/SolrDocumentQueryFactory.java (added)
• service/SolrFacetQueryFactory.java (modified) (1 diff)
• service/impl/AbstractSolrQueryFactory.java (added)
• service/impl/SolrDocumentQueryFactoryImpl.java (added)
• service/impl/SolrDocumentServiceImpl.java (modified) (2 diffs)
• service/impl/SolrFacetQueryFactoryImpl.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
 import eu.clarin.cmdi.vlo.service.impl.SearchResultsDaoImpl;
+import eu.clarin.cmdi.vlo.service.impl.SolrDocumentQueryFactoryImpl;
 import eu.clarin.cmdi.vlo.service.impl.SolrDocumentServiceImpl;
 import eu.clarin.cmdi.vlo.service.impl.SolrFacetFieldsService;
@@ -70 +71 @@
     @Bean
     public FacetFieldsService facetFieldsService() {
-        return new SolrFacetFieldsService(searchResultsDao(), queryFactory());
+        return new SolrFacetFieldsService(searchResultsDao(), facetQueryFactory());
     }
     
     @Bean
     public SolrDocumentService documentService() {
-        return new SolrDocumentServiceImpl(searchResultsDao(), queryFactory());
+        return new SolrDocumentServiceImpl(searchResultsDao(), documentQueryFactory());
     }
 
@@ -84 +85 @@
 
     @Bean
-    public SolrFacetQueryFactory queryFactory() {
+    public SolrFacetQueryFactory facetQueryFactory() {
         return new SolrFacetQueryFactoryImpl(vloConfig().getFacetFields());
+    }
+    
+    @Bean
+    public SolrDocumentQueryFactoryImpl documentQueryFactory() {
+        return new SolrDocumentQueryFactoryImpl();
     }
 

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

@@ -31 +31 @@
 
     SolrQuery createCountFacetsQuery();
-    
-    SolrQuery createDocumentQuery(QueryFacetsSelection selection, int first, int count);
 
 }

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

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.SearchResultsDao;
+import eu.clarin.cmdi.vlo.service.SolrDocumentQueryFactory;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
-import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
 import java.util.List;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -32 +32 @@
 
     private final SearchResultsDao searchResultsDao;
-    private final SolrFacetQueryFactory queryFatory;
+    private final SolrDocumentQueryFactory queryFatory;
 
-    public SolrDocumentServiceImpl(SearchResultsDao searchResultsDao, SolrFacetQueryFactory queryFatory) {
+    public SolrDocumentServiceImpl(SearchResultsDao searchResultsDao, SolrDocumentQueryFactory queryFatory) {
         this.searchResultsDao = searchResultsDao;
         this.queryFatory = queryFatory;

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.impl;
 
-import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.util.ClientUtils;
 
 /**
@@ -33 +28 @@
  * @author twagoo
  */
-public class SolrFacetQueryFactoryImpl implements SolrFacetQueryFactory {
+public class SolrFacetQueryFactoryImpl extends AbstractSolrQueryFactory implements SolrFacetQueryFactory {
     
-    private static final String SOLR_SEARCH_ALL = "*:*";
     private final SolrQuery facetCountQuery;
     private final String[] facets;
@@ -58 +52 @@
     }
     
-    @Override
-    public SolrQuery createDocumentQuery(QueryFacetsSelection selection, int first, int count) {
-        final SolrQuery query = getDefaultDocumentQuery();
-        addQueryFacetParameters(query, selection);
-        query.setStart(first);
-        query.setRows(count);
-        return query;
-    }
-    
-    protected void addQueryFacetParameters(final SolrQuery query, QueryFacetsSelection queryFacetsSelections) {
-        final String queryString = queryFacetsSelections.getQuery();
-        
-        if (queryString == null) {
-            query.setQuery(SOLR_SEARCH_ALL);
-        } else {
-            query.setQuery(ClientUtils.escapeQueryChars(queryString));
-        }
-        
-        final Map<String, Collection<String>> selections = queryFacetsSelections.getSelection();
-        if (selections != null) {
-            final List<String> encodedQueries = new ArrayList(selections.size()); // assuming every facet has one selection, most common scenario
-            for (Map.Entry<String, Collection<String>> selection : selections.entrySet()) {
-                final String facetName = selection.getKey();
-                final Collection<String> values = selection.getValue();
-                if (values != null) {
-                    for (String value : values) {
-                        encodedQueries.add(String.format("%s:%s", facetName, ClientUtils.escapeQueryChars(value)));
-                    }
-                }
-            }
-            query.setFilterQueries(encodedQueries.toArray(new String[encodedQueries.size()]));
-        }
-    }
-    
     private SolrQuery getDefaultFacetQuery() {
         SolrQuery query = new SolrQuery();
@@ -101 +61 @@
     }
     
-    private SolrQuery getDefaultDocumentQuery() {
-        SolrQuery query = new SolrQuery();
-        query.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID, FacetConstants.FIELD_DESCRIPTION, FacetConstants.FIELD_COLLECTION, FacetConstants.FIELD_RESOURCE);
-        query.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
-        return query;
-    }
-    
     @Override
     public synchronized SolrQuery createCountFacetsQuery() {