Changeset 5202

Timestamp:

05/15/14 12:19:25 (10 years ago)

Author:

Twan Goosen

Message:

Merged a change from 3.0 branch that checks both ID and Selflink fields when looking up a document by ID

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java (modified) (3 diffs)
• vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java (modified) (1 diff)

vlo/trunk/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.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -73 +74 @@
     }
 
+    /**
+     * Creates an OR filter query over the provided facet/value pairs (a query
+     * that requests all records matching ANY of the facet/value pairs)
+     *
+     * @param facetValues map with facet/value pairs that should be matched
+     * @return
+     */
+    protected final String createFilterOrQuery(Map<String, String> facetValues) {
+        // escape value and wrap in quotes to make literal query
+        final StringBuilder queryBuilder = new StringBuilder();
+        final Iterator<Map.Entry<String, String>> iterator = facetValues.entrySet().iterator();
+        while (iterator.hasNext()) {
+            final Map.Entry<String, String> facetValue = iterator.next();
+            queryBuilder.append(createFilterQuery(facetValue.getKey(), facetValue.getValue()));
+            if (iterator.hasNext()) {
+                queryBuilder.append(" OR ");
+            }
+        }
+        return queryBuilder.toString();
+    }
+
 }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.solr.impl;
 
+import com.google.common.collect.ImmutableMap;
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -35 +36 @@
 
     /**
-     * 
+     *
      * @param documentFields fields that should be included in document queries
      */
@@ -63 +64 @@
         query.setQuery(SOLR_SEARCH_ALL);
         // filter by ID
-        query.addFilterQuery(createFilterQuery(FacetConstants.FIELD_ID, docId));
+        // check for ID value in both 'id' and 'self link' fields, both ought to
+        // be unique and self link use to be ID in old VLO, so this should keep old
+        // URL's valid with a minimal likelihood of clashes
+        final ImmutableMap<String, String> idOrQueryMap = ImmutableMap.<String, String>builder()
+                .put(FacetConstants.FIELD_ID, docId)
+                .put(FacetConstants.FIELD_SELF_LINK, docId)
+                .build();
+        query.addFilterQuery(createFilterOrQuery(idOrQueryMap));
+        
         // one result max
         query.setRows(1);

vlo/trunk/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java

@@ -75 +75 @@
     @Test
     public void testCreateDocumentQueryForDocId() {
-        final SolrQuery query = instance.createDocumentQuery("documentId");
+        final SolrQuery query = instance.createDocumentQuery("document\"Id");
 
         final String[] filterQueries = query.getFilterQueries();
         assertEquals(1, filterQueries.length);
-        assertEquals("id:\"documentId\"", filterQueries[0]);
+        // expecting query that looks in both id and selflink fields with properly escaped values
+        assertEquals("id:\"document\\\"Id\" OR _selfLink:\"document\\\"Id\"", filterQueries[0]);
 
         final String fields = query.getFields();