Changeset 6676

Timestamp:

10/13/15 11:47:50 (9 years ago)

Author:

Twan Goosen

Message:

merged changes from 3.3 branch to trunk

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (1 diff)
• vlo-commons/src/main/resources/VloConfig.xml (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDaoImpl.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java (modified) (1 diff)

vlo/trunk/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -109 +109 @@
     private boolean showResultScores = false;
 
-    private boolean processHierarchies = false;
+    private boolean processHierarchies = true;
 
     /**

vlo/trunk/vlo-commons/src/main/resources/VloConfig.xml

@@ -147 +147 @@
     <showResultScores>false</showResultScores>
     
-    <processHierarchies>false</processHierarchies>
+    <processHierarchies>true</processHierarchies>
 </VloConfig>

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

@@ -11 +11 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83 +84 @@
             logger.trace("Response: {}", response);
             return response;
+        } catch(SolrException e) {
+            logger.error("Error getting data:", e);
+            throw new RuntimeException(e);
         } catch (SolrServerException e) {
             logger.error("Error getting data:", e);

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

@@ -47 +47 @@
     public SolrQuery createFacetQuery(QueryFacetsSelection queryFacetsSelections, List<String> facets, int facetValueLimit) {
         final SolrQuery query = getBaseQuery(facets);
-        // we can use the 'fast' request handler here, document ranking is of no interest
-        query.setRequestHandler(FacetConstants.SOLR_REQUEST_HANDLER_FAST);
         addQueryFacetParameters(query, queryFacetsSelections);
         query.setFacetLimit(facetValueLimit);