Changeset 29217

Timestamp:

2014-08-19T19:40:31+12:00 (10 years ago)

Author:

ak19

Message:

Terms must be found in a sorlCore (sidx or didx) of THIS collection, not in the first solrCore in the CoreContainer (solr.xml), since the CoreContainer can contain core descriptors of other GS collections as welll.

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java (modified) (3 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/util/SolrQueryWrapper.java

@@ -78 +78 @@
     SolrServer solr_core = null;
 
+    String collection_core_name_prefix = null;
+
     public SolrQueryWrapper()
     {
@@ -93 +95 @@
         this.solr_core = solr_core;
     }
+
+    public void setCollectionCoreNamePrefix(String colCoreNamePrefix) {
+    this.collection_core_name_prefix = colCoreNamePrefix;
+    }
+
   // make sure its not null.
   public void setSortField(String sort_field) {
@@ -158 +165 @@
         Iterator<SolrCore> coreIterator = solrCores.iterator();
 
-        // Just use the first core, since the term frequency of any term is the same regardless of core
-        if(coreIterator.hasNext()) {
+        // Just use the first core that matches the collection name, since the term 
+        // frequency of any term is the same regardless of whether its didx or sidx core
+        boolean foundCore = false;
+        while(coreIterator.hasNext() && !foundCore) {
             SolrCore solrCore = coreIterator.next();
-            
+            if(!solrCore.getName().startsWith(this.collection_core_name_prefix)) {
+            //logger.error("### Skipping core not of this collection: " + solrCore.getName());
+            continue;
+            }
+
+            //logger.error("### Found core " + solrCore.getName() + " of this collection " + this.collection_core_name_prefix);
+            foundCore = true;
             
             LocalSolrQueryRequest solrQueryRequest = new LocalSolrQueryRequest(solrCore, solrQuery);