Changeset 33306 for gs3-extensions/solr

Timestamp:

2019-07-08T13:59:12+12:00 (5 years ago)

Author:

kjdon

Message:

we need to use (the new) level_ids list to determine which cores we are using, not just assume didx and sidx. This class was adding in an sidx when one wasn't needed, and then it would never get deleted

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java (modified) (1 diff)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -571 +571 @@
         solrServer.setConnectionTimeout(3000);
         //Cores
-        String coreSecName = getCollectionCoreNamePrefix() + "-sidx";
-        String coreDocName = getCollectionCoreNamePrefix() + "-didx";
-
-
-        if (!checkSolrCore(coreSecName, solrServer)){
-            if (!activateSolrCore(coreSecName, solrServer)){
-                logger.error("Couldn't activate Solr core " + coreSecName + " for collection " + cluster_name);
-                return false;
-            }
-        }
-        if (!checkSolrCore(coreDocName, solrServer)){
-            if (!activateSolrCore(coreDocName, solrServer)){
-                logger.error("Couldn't activate Solr core " + coreDocName + " for collection " + cluster_name);
-                return false;
-            }
-        }
+        // check level_ids to see which cores we have
+        for (int i=0; i<level_ids.size(); i++) {
+          String level = level_ids.get(i);
+          if (level.toUpperCase().equals("SEC")) {
+            String coreSecName = getCollectionCoreNamePrefix() + "-sidx";
+            if (!checkSolrCore(coreSecName, solrServer)){
+              if (!activateSolrCore(coreSecName, solrServer)){
+            logger.error("Couldn't activate Solr core " + coreSecName + " for collection " + cluster_name);
+            return false;
+              }
+            }
+          }
+          else if (level.toUpperCase().equals("DOC")){
+            String coreDocName = getCollectionCoreNamePrefix() + "-didx";
+            if (!checkSolrCore(coreDocName, solrServer)){
+              if (!activateSolrCore(coreDocName, solrServer)){
+            logger.error("Couldn't activate Solr core " + coreDocName + " for collection " + cluster_name);
+            return false;
+              }
+            }
+          }
+        } // for each level
         return true;
     }