Changeset 29142 for gs3-extensions/solr/trunk/src/src

Timestamp:

2014-07-16T21:09:14+12:00 (10 years ago)

Author:

ak19

Message:

Part of port from lucene3.3.0 to lucene4.7.2. Solr related. 1. Java and perl code changes for solr4.7.2; 2. Dr Bainbridge further fixed a bug in how the variable called running is set in solrserver.pm

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3

Files:

• service/GS2SolrSearch.java (modified) (5 diffs)
• service/SolrSearch.java (modified) (1 diff)
• util/SolrQueryResult.java (modified) (1 diff)
• util/SolrQueryWrapper.java (modified) (1 diff)

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

@@ -35 +35 @@
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrCore;
-import org.greenstone.LuceneWrapper3.SharedSoleneQueryResult;
+import org.greenstone.LuceneWrapper4.SharedSoleneQueryResult;
 import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSFile;
@@ -109 +109 @@
             File solr_xml = new File( solr_home,"solr.xml" );
             
-            all_solr_cores.load(solr_home_str,solr_xml);
+            //all_solr_cores.load(solr_home_str,solr_xml);
+            all_solr_cores.load();
 
         } catch (Exception e) {
@@ -184 +185 @@
                 if(solrCoreName.startsWith(collection_core_name_prefix)) {
                 
-                logger.error("**** Removing collection-specific core: " + solrCoreName + " from CoreContainer");
+                logger.info("**** Removing collection-specific core: " + solrCoreName + " from CoreContainer");
                 
                 // CoreContainer.remove(String name): removes and returns registered core w/o decrementing it's reference count
@@ -190 +191 @@
                 SolrCore solr_core = all_solr_cores.remove(solrCoreName);
                 while(!solr_core.isClosed()) {
-                    logger.error("@@@@@@ " + solrCoreName + " was not closed. Closing....");
+                    logger.warn("@@@@@@ " + solrCoreName + " was not closed. Closing....");
                     solr_core.close(); // http://lucene.apache.org/solr/api/org/apache/solr/core/SolrCore.html
                 } 
                 if(solr_core.isClosed()) {
-                    logger.error("@@@@@@ " + solrCoreName + " is closed.");
+                    logger.info("@@@@@@ " + solrCoreName + " is closed.");
                 }
                 solr_core = null;
@@ -208 +209 @@
             Collection<String> coreNamesRemaining = all_solr_cores.getCoreNames();
             if(coreNamesRemaining.isEmpty()) {
-            logger.error("**** CoreContainer contains 0 solrCores. Shutting down...");
+            logger.info("**** CoreContainer contains 0 solrCores. Shutting down...");
             
             all_solr_cores.shutdown(); // wouldn't do anything anyway for 0 cores I think

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

@@ -146 +146 @@
             File solr_xml = new File( solr_home,"solr.xml" );
             
-            solr_cores.load(solr_home_str,solr_xml);            
+            //solr_cores.load(solr_home_str,solr_xml);          
+            solr_cores.load();
         } catch (Exception e) {
             logger.error("Exception in SolrSearch.configure(): " + e.getMessage());

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

@@ -30 +30 @@
 
 import org.apache.solr.client.solrj.response.FacetField;
-import org.greenstone.LuceneWrapper3.SharedSoleneQueryResult;
+import org.greenstone.LuceneWrapper4.SharedSoleneQueryResult;
 
 /**

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

@@ -39 +39 @@
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.greenstone.LuceneWrapper3.SharedSoleneQuery;
-import org.greenstone.LuceneWrapper3.SharedSoleneQueryResult;
+import org.greenstone.LuceneWrapper4.SharedSoleneQuery;
+import org.greenstone.LuceneWrapper4.SharedSoleneQueryResult;
 
 import com.google.gson.Gson;