Changeset 4972

Timestamp:

04/14/14 14:49:38 (10 years ago)

Author:

Twan Goosen

Message:

Removed facet sanitising when retrieving documents

Location:

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

Files:

• main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImpl.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java (modified) (1 diff)

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -71 +70 @@
     protected final String createFilterQuery(String facetName, String value) {
         // escape value and wrap in quotes to make literal query
-        //TODO: encode value
         return String.format("%s:\"%s\"", facetName, ClientUtils.escapeQueryChars(value));
     }

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

@@ -37 +37 @@
     @Override
     public SolrDocumentList getDocuments(SolrQuery query) {
-        QueryResponse queryResponse = fireQuery(sanitise(query));
+        QueryResponse queryResponse = fireQuery(query);
         final SolrDocumentList documents = queryResponse.getResults();
         logger.debug("Found {} documents", documents.getNumFound());

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java

@@ -149 +149 @@
         }
 
-        query.setFilterQueries("dummyField:test");
-        {
-            // should not affect result due to sanitisation
-            // only document with id "1" should match this
-            SolrDocumentList documents = instance.getDocuments(query);
-            assertEquals(1, documents.getNumFound());
-            assertEquals("1", documents.get(0).getFieldValue(FIELD_ID));
-        }
-
         query.setFilterQueries(FIELD_COLLECTION + ":Collection2");
         {