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

Adding checks for exceptions to solr index building.

Browse source
This commit is contained in:
Brian Caruso 2013-07-16 16:15:26 -04:00
parent 268a786214
commit fb28ce2d6d
2 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
View file

@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -19,7 +18,6 @@ import org.apache.solr.common.SolrInputDocument;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface; import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface;
import edu.cornell.mannlib.vitro.webapp.search.docbuilder.Obj2DocIface;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSolrDocument; import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSolrDocument;
@ -159,7 +157,7 @@ public class SolrIndexer implements IndexerIface {
log.debug("could not remove documents from before build, " ,e); log.debug("could not remove documents from before build, " ,e);
} }
try { try {
UpdateResponse res = server.commit(); server.commit();
} catch (Throwable e) { } catch (Throwable e) {
if( ! shutdownRequested ){ if( ! shutdownRequested ){
log.debug("could not commit to solr server, " + log.debug("could not commit to solr server, " +

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

@ -17,6 +17,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.vocabulary.OWL; import com.hp.hpl.jena.vocabulary.OWL;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@ -160,23 +161,28 @@ public class IndividualToSolrDocument {
//ALLTEXT, all of the 'full text' //ALLTEXT, all of the 'full text'
StringBuffer allTextValue = new StringBuffer(); StringBuffer allTextValue = new StringBuffer();
//collecting data property statements try{
List<DataPropertyStatement> dataPropertyStatements = ind.getDataPropertyStatements(); //collecting data property statements
if (dataPropertyStatements != null) { List<DataPropertyStatement> dataPropertyStatements = ind.getDataPropertyStatements();
Iterator<DataPropertyStatement> dataPropertyStmtIter = dataPropertyStatements.iterator(); if (dataPropertyStatements != null) {
while (dataPropertyStmtIter.hasNext()) { Iterator<DataPropertyStatement> dataPropertyStmtIter = dataPropertyStatements.iterator();
DataPropertyStatement dataPropertyStmt = dataPropertyStmtIter.next(); while (dataPropertyStmtIter.hasNext()) {
if(dataPropertyStmt.getDatapropURI().equals(label)){ // we don't want label to be added to alltext DataPropertyStatement dataPropertyStmt = dataPropertyStmtIter.next();
continue; if(dataPropertyStmt.getDatapropURI().equals(label)){ // we don't want label to be added to alltext
} else if(dataPropertyStmt.getDatapropURI().equals("http://vivoweb.org/ontology/core#preferredTitle")){ continue;
//add the preferredTitle field } else if(dataPropertyStmt.getDatapropURI().equals("http://vivoweb.org/ontology/core#preferredTitle")){
String preferredTitle = null; //add the preferredTitle field
doc.addField(term.PREFERRED_TITLE, ((preferredTitle=dataPropertyStmt.getData()) == null)?"":preferredTitle); String preferredTitle = null;
log.debug("Preferred Title: " + dataPropertyStmt.getData()); doc.addField(term.PREFERRED_TITLE, ((preferredTitle=dataPropertyStmt.getData()) == null)?"":preferredTitle);
log.debug("Preferred Title: " + dataPropertyStmt.getData());
}
allTextValue.append(" ");
allTextValue.append(((t=dataPropertyStmt.getData()) == null)?"":t);
} }
allTextValue.append(" ");
allTextValue.append(((t=dataPropertyStmt.getData()) == null)?"":t);
} }
}catch(JenaException je){
//VIVO-15 Trap for characters that cause search indexing to abort
log.error(String.format("Continuing to index %s but could not get all dataproperties because %s",ind.getURI(),je.getMessage()));
} }
allTextValue.append(objectNames.toString()); allTextValue.append(objectNames.toString());
@ -209,24 +215,30 @@ public class IndividualToSolrDocument {
*/ */
protected void addObjectPropertyText(Individual ind, SolrInputDocument doc, protected void addObjectPropertyText(Individual ind, SolrInputDocument doc,
StringBuffer objectNames, StringBuffer addUri) { StringBuffer objectNames, StringBuffer addUri) {
List<ObjectPropertyStatement> objectPropertyStatements = ind.getObjectPropertyStatements();
if (objectPropertyStatements != null) { try{
Iterator<ObjectPropertyStatement> objectPropertyStmtIter = objectPropertyStatements.iterator(); List<ObjectPropertyStatement> objectPropertyStatements = ind.getObjectPropertyStatements();
while (objectPropertyStmtIter.hasNext()) { if (objectPropertyStatements != null) {
ObjectPropertyStatement objectPropertyStmt = objectPropertyStmtIter.next(); Iterator<ObjectPropertyStatement> objectPropertyStmtIter = objectPropertyStatements.iterator();
if( "http://www.w3.org/2002/07/owl#differentFrom".equals(objectPropertyStmt.getPropertyURI()) ){ while (objectPropertyStmtIter.hasNext()) {
continue; ObjectPropertyStatement objectPropertyStmt = objectPropertyStmtIter.next();
} if( "http://www.w3.org/2002/07/owl#differentFrom".equals(objectPropertyStmt.getPropertyURI()) ){
try { continue;
objectNames.append(" "); }
String t=null; try {
objectNames.append(((t=objectPropertyStmt.getObject().getRdfsLabel()) == null)?"":t); objectNames.append(" ");
addUri.append(" "); String t=null;
addUri.append(((t=objectPropertyStmt.getObject().getURI()) == null)?"":t); objectNames.append(((t=objectPropertyStmt.getObject().getRdfsLabel()) == null)?"":t);
} catch (Exception e) { addUri.append(" ");
log.debug("could not index name of related object: " + e.getMessage()); addUri.append(((t=objectPropertyStmt.getObject().getURI()) == null)?"":t);
} catch (Exception e) {
log.debug("could not index name of related object: " + e.getMessage());
}
} }
} }
}catch(JenaException je){
//VIVO-15 Trap for characters that cause search indexing to abort
log.error(String.format("Continuing to index %s but could not get all object properties because %s",ind.getURI(),je.getMessage()));
} }
} }