From efb879ce1eb19b0e6e56f91e51fd1abba97a562f Mon Sep 17 00:00:00 2001
From: Brian Caruso <bdc34@cornell.edu>
Date: Mon, 22 Jul 2013 15:44:22 -0400
Subject: [PATCH] Removing classLocalNameLowerCase from solr schema.xml
 VIVO-161

---
 solr/homeDirectoryTemplate/conf/schema.xml    |  1 -
 .../webapp/search/VitroSearchTermNames.java   |  2 --
 .../vitro/webapp/search/solr/SolrSetup.java   | 19 ++++---------------
 .../IndividualToSolrDocument.java             |  1 -
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/solr/homeDirectoryTemplate/conf/schema.xml b/solr/homeDirectoryTemplate/conf/schema.xml
index 95b616d3e..bc5fcad66 100644
--- a/solr/homeDirectoryTemplate/conf/schema.xml
+++ b/solr/homeDirectoryTemplate/conf/schema.xml
@@ -192,7 +192,6 @@
   <field name="type" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
   
   <field name="classLocalName" type="text" indexed="true" stored="true" multiValued="true"/>
-  <field name="classLocalNameLowerCase" type="text" indexed="true" stored="false" multiValued="true"/>
   
   <field name="classgroup" type="string" indexed="true" stored="true" multiValued="true"/>
   <field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" omitNorms="true" multiValued="true"/>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
index 059b7ce3c..af49925fb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
@@ -26,8 +26,6 @@ public class VitroSearchTermNames {
     /** Does the individual have a thumbnail image? 1=yes 0=no */
     public static final String THUMBNAIL = "THUMBNAIL";        
     /** class names in human readable form of an individual*/
-    public static final String CLASSLOCALNAMELOWERCASE = "classLocalNameLowerCase";
-    /** class names in human readable form of an individual*/
     public static final String CLASSLOCALNAME = "classLocalName";      
 
     // Fields derived from rdfs:label
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
index 3c7fd9c06..d8f72363c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
@@ -11,8 +11,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
 import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
-import org.apache.solr.client.solrj.impl.XMLResponseParser;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
 
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
@@ -90,22 +89,12 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
                     "It should be something like http://localhost:${port}" + context.getContextPath() + "solr" 
                     );
             return;
-        }
-        
-        URL solrServerUrl = null;
-        try {
-        	solrServerUrl = new URL(solrServerUrlString);
-        } catch (MalformedURLException e) {
-            ss.fatal(this, "Can't connect with the solr server. " +
-            		"The value for vitro.local.solr.url in runtime.properties is not a valid URL: " + solrServerUrlString);
-            return;
-        }
+        }        
         
         try {                                            
-            CommonsHttpSolrServer server;
+            HttpSolrServer server;
             boolean useMultiPartPost = true;
-            //It would be nice to use the default binary handler but there seem to be library problems
-            server = new CommonsHttpSolrServer(solrServerUrl,null,new XMLResponseParser(),useMultiPartPost); 
+            server = new HttpSolrServer( solrServerUrlString ); 
             server.setSoTimeout(10000);  // socket read timeout
             server.setConnectionTimeout(10000);
             server.setDefaultMaxConnectionsPerHost(100);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSolrDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSolrDocument.java
index b42527190..7c340efde 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSolrDocument.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSolrDocument.java
@@ -272,7 +272,6 @@ public class IndividualToSolrDocument {
                 
                 if(clz.getLocalName() != null){
                     doc.addField(term.CLASSLOCALNAME, clz.getLocalName());
-                    doc.addField(term.CLASSLOCALNAMELOWERCASE, clz.getLocalName().toLowerCase());
                 }
                 
                 if(clz.getName() != null){