Changeset 4513

Timestamp:

02/13/14 16:39:33 (10 years ago)

Author:

twagoo

Message:

Implemented facets count method

Location:

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

Files:

• SolrQueryFactory.java (modified) (1 diff)
• impl/SolrFacetFieldsService.java (modified) (2 diffs)
• impl/SolrQueryFactoryImpl.java (modified) (2 diffs)

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

@@ -28 +28 @@
 
     SolrQuery createFacetQuery(List<FacetSelection> selection, String query);
+    
+    SolrQuery createCountFacetsQuery();
 
 }

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

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.service.SolrQueryFactory;
 import java.util.List;
-import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.response.FacetField;
 
@@ -46 +45 @@
     @Override
     public long getFacetFieldCount() {
-        return (long) searchResultsDao.getFacets(COUNT_FACETS_QUERY).size(); //TODO: count facets
+        return (long) searchResultsDao.getFacets(queryFatory.createCountFacetsQuery()).size();
     }
-    public static final SolrQuery COUNT_FACETS_QUERY = new SolrQuery("");
 
 }

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

@@ -33 +33 @@
 
     private static final String SOLR_SEARCH_ALL = "*:*";
+    private final SolrQuery countQuery;
     private final VloConfig config;
 
     public SolrQueryFactoryImpl(VloConfig config) {
         this.config = config;
+        
+        // create the query used to count facets (will never change)
+        countQuery = getDefaultFacetQuery();
+        countQuery.setRows(0);
     }
-
+    
     @Override
     public SolrQuery createFacetQuery(List<FacetSelection> selections, String queryString) {
@@ -72 +77 @@
         return result;
     }
+
+    @Override
+    public synchronized SolrQuery createCountFacetsQuery() {
+        return countQuery;
+    }
+
 }