litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing classLocalNameLowerCase from solr schema.xml VIVO-161

Browse source
This commit is contained in:
Brian Caruso 2013-07-22 15:44:22 -04:00
parent 73fd47dd55
commit efb879ce1e
4 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
solr/homeDirectoryTemplate/conf/schema.xml
View file

@ -192,7 +192,6 @@
<field name="type" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/> <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="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="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"/> <field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" omitNorms="true" multiValued="true"/>

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
View file

@ -26,8 +26,6 @@ public class VitroSearchTermNames {
/** Does the individual have a thumbnail image? 1=yes 0=no */ /** Does the individual have a thumbnail image? 1=yes 0=no */
public static final String THUMBNAIL = "THUMBNAIL"; public static final String THUMBNAIL = "THUMBNAIL";
/** class names in human readable form of an individual*/ /** 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"; public static final String CLASSLOCALNAME = "classLocalName";
// Fields derived from rdfs:label // Fields derived from rdfs:label

17
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
View file

@ -11,8 +11,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
@ -92,20 +91,10 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
return; return;
} }
URL solrServerUrl = null;
try { try {
solrServerUrl = new URL(solrServerUrlString); HttpSolrServer server;
} 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;
boolean useMultiPartPost = true; boolean useMultiPartPost = true;
//It would be nice to use the default binary handler but there seem to be library problems server = new HttpSolrServer( solrServerUrlString );
server = new CommonsHttpSolrServer(solrServerUrl,null,new XMLResponseParser(),useMultiPartPost);
server.setSoTimeout(10000); // socket read timeout server.setSoTimeout(10000); // socket read timeout
server.setConnectionTimeout(10000); server.setConnectionTimeout(10000);
server.setDefaultMaxConnectionsPerHost(100); server.setDefaultMaxConnectionsPerHost(100);

1
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSolrDocument.java
View file

@ -272,7 +272,6 @@ public class IndividualToSolrDocument {
if(clz.getLocalName() != null){ if(clz.getLocalName() != null){
doc.addField(term.CLASSLOCALNAME, clz.getLocalName()); doc.addField(term.CLASSLOCALNAME, clz.getLocalName());
doc.addField(term.CLASSLOCALNAMELOWERCASE, clz.getLocalName().toLowerCase());
} }
if(clz.getName() != null){ if(clz.getName() != null){