Changeset 4531

Timestamp:

02/18/14 07:18:14 (10 years ago)

Author:

twagoo

Message:

cleaned up solr dao implementation

Location:

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

Files:

• SearchResultsDao.java (modified) (1 diff)
• impl/SearchResultsDaoImpl.java (modified) (2 diffs)
• impl/SolrQueryFactoryImpl.java (modified) (1 diff)

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

@@ -32 +32 @@
 
     List<FacetField> getFacets(SolrQuery query);
-
-    SolrDocumentList getResults(SolrQuery query);
     
 }

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

@@ -22 +22 @@
 
     @Override
-    public SolrDocumentList getResults(SolrQuery query) {
-        setDefaultSortField(query);
-        QueryResponse response = fireQuery(query);
-        SolrDocumentList results = response.getResults();
-        return results;
-    }
-
-    @Override
     public List<FacetField> getFacets(SolrQuery query) {
         final QueryResponse response = fireQuery(query);
@@ -45 +37 @@
     }
 
-    private void setDefaultSortField(SolrQuery query) {
-        if (query.getSortField() == null) {
-            query.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
-        }
-    }
-
 }

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

@@ -89 +89 @@
 
     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;
+        SolrQuery query = new SolrQuery();
+        query.setRows(0);
+        query.setFacet(true);
+        query.setFacetMinCount(1);
+        query.addFacetField(config.getFacetFields());
+        return query;
     }
 
     private SolrQuery getDefaultDocumentQuery() {
-        SolrQuery result = new SolrQuery();
-        result.setFields(FacetConstants.FIELD_NAME, FacetConstants.FIELD_ID, FacetConstants.FIELD_DESCRIPTION, FacetConstants.FIELD_COLLECTION, FacetConstants.FIELD_RESOURCE);
-        return result;
+        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;
     }