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

Timestamp:

2012-07-03T19:53:05+12:00 (12 years ago)

Author:

ak19

Message:

First commit for allowing a SOLR collection to be activated without having to run ant restart to get Greenstone to allow searching the updated solr index.

File:

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

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

@@ -74 +74 @@
 
                 String solr_home_str = GSFile.extHome(gsdl3_home, solr_ext_name);
-                File solr_home = new File(solr_home_str);
-                File solr_xml = new File(solr_home, "solr.xml");
-
-                all_solr_cores = new CoreContainer(solr_home_str, solr_xml);
+
+                all_solr_cores = new CoreContainer(solr_home_str);
             }
             catch (Exception e)
@@ -91 +89 @@
     public boolean configure(Element info, Element extra_info)
     {
-        if (!super.configure(info, extra_info))
-        {
-            return false;
-        }
-
+        boolean success = super.configure(info, extra_info);
+
+        // 1. Make the CoreContainer reload solr.xml
+        // This is particularly needed for when activate.pl is executed during
+        // a running GS3 server. At that point, the solr collection is reactivated and 
+        // we need to tell Greenstone that the solr index has changed. This requires
+        // the CoreContainer to reload the solr.xml file, and it all works again.
+
+        solr_core_cache.clear(); // clear the map of existing solr cores
+        
+        // Reload the updated solr.xml into the CoreContainer
+        // (Doing an all_solr_cores.shutdown() first doesn't seem to be required)
+        try {   
+            String solr_home_str = all_solr_cores.getSolrHome();
+            File solr_home = new File(solr_home_str);
+            File solr_xml = new File( solr_home,"solr.xml" );
+            
+            all_solr_cores.load(solr_home_str,solr_xml);
+        } catch (Exception e) {
+            logger.error("Exception in GS2SolrSearch.configure(): " + e.getMessage());
+            e.printStackTrace();
+            return false;
+        }
+        
+        if(!success) {
+            return false;
+        }
+        
+        // 2. Setting up facets
         Element searchElem = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
         NodeList configIndexElems = searchElem.getElementsByTagName(GSXML.INDEX_ELEM);