Changeset 4629

Timestamp:

03/06/14 12:00:01 (10 years ago)

Author:

Twan Goosen

Message:

Landing page link now working. Document queries no longer get sanitised. Added some inline comments to document query factory

Location:

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

Files:

• AutoCompleteDao.java (modified) (1 diff)
• SearchResultsDaoImpl.java (modified) (2 diffs)
• SolrDaoImpl.java (modified) (4 diffs)
• SolrDocumentQueryFactoryImpl.java (modified) (3 diffs)

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

@@ -37 +37 @@
             query.setQuery(input.toLowerCase());
             query.setQueryType("/suggest");
-            QueryResponse response = fireQuery(query);
+            QueryResponse response = fireQuery(sanitise(query));
             if (response.getSpellCheckResponse() != null) {
                 List<Suggestion> suggestions = response.getSpellCheckResponse().getSuggestions();

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.service.SearchResultsDao;
-import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import java.util.List;
@@ -23 +22 @@
     @Override
     public List<FacetField> getFacets(SolrQuery query) {
-        final QueryResponse response = fireQuery(query);
+        final QueryResponse response = fireQuery(sanitise(query));
         final List<FacetField> facetFields = response.getFacetFields();
         logger.debug("Found {} facet fields", facetFields.size());

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -33 +32 @@
      * Basic sanitising of Solr queries.
      *
+     * TODO: Move this to QueryFacetSelection level??
+     * 
      * Query is based on the URL to the VLO web application. Also, explain about
      * the URL and ?fq=language:dutch Assume filters have the form a:b like for
@@ -40 +41 @@
      * @return
      */
-    private SolrQuery sanitise(SolrQuery query) {
+    protected SolrQuery sanitise(SolrQuery query) {
 
         // String [] facetsFromConfig; 
@@ -80 +81 @@
 
     protected QueryResponse fireQuery(SolrQuery query) {
-        SolrQuery sanitisedQuery;
-        sanitisedQuery = sanitise(query);
         try {
             logger.debug("Executing query: {}", query);
-            final QueryResponse response = solrServer.query(sanitisedQuery);
+            final QueryResponse response = solrServer.query(query);
             logger.trace("Response: {}", response);
             return response;

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

@@ -30 +30 @@
     @Override
     public SolrQuery createDocumentQuery(QueryFacetsSelection selection, int first, int count) {
+        // make a query to get all documents that match the selection criteria
         final SolrQuery query = getDefaultDocumentQuery();
+        // apply selection
         addQueryFacetParameters(query, selection);
+        // set offset and limit
         query.setStart(first);
         query.setRows(count);
@@ -39 +42 @@
     @Override
     public SolrQuery createDocumentQuery(String docId) {
+        // make a query to look up a specific document by its ID
         final SolrQuery query = getDefaultDocumentQuery();
+        // consider all documents
         query.setQuery(SOLR_SEARCH_ALL);
+        // filter by ID
         query.addFilterQuery(createFilterQuery(FacetConstants.FIELD_ID, docId));
+        // one result max
         query.setRows(1);
         return query;
@@ -49 +56 @@
     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.setFields(FacetConstants.FIELD_NAME, 
+                FacetConstants.FIELD_ID, 
+                FacetConstants.FIELD_DESCRIPTION, 
+                FacetConstants.FIELD_COLLECTION,
+                FacetConstants.FIELD_RESOURCE,
+                FacetConstants.FIELD_LANDINGPAGE);
         query.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
         return query;