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

Merge branch 'issue-vivo-15' into develop

Browse source
This commit is contained in:
Brian Caruso 2013-07-16 16:18:00 -04:00
commit 1c4bb63016
4 changed files with 71 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
solr/homeDirectoryTemplate/conf/solrconfig.xml
View file

@ -860,7 +860,7 @@
class="solr.XmlUpdateRequestHandler">
<!-- Run the etag processor on each update request. -->
<lst name="defaults">
<str name="update.processor">etag</str>
<str name="update.chain">etag</str>
</lst>
</requestHandler>

27
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
View file

@ -2,7 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.dao.filtering;
import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants.SOME_LITERAL;
import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants.*;
import java.sql.Timestamp;
import java.util.ArrayList;
@ -58,6 +58,8 @@ public class IndividualFiltering implements Individual {
public List<DataProperty> getDataPropertyList() {
List<DataProperty> dprops = _innerIndividual.getDataPropertyList();
LinkedList<DataProperty> outdProps = new LinkedList<DataProperty>();
if( dprops == null )
return outdProps;
Filter.filter(dprops,_filters.getDataPropertyFilter(), outdProps);
ListIterator<DataProperty> it = outdProps.listIterator();
@ -83,6 +85,8 @@ public class IndividualFiltering implements Individual {
// the DataProperty with statements. - jblake
List<DataProperty> outdProps = new ArrayList<DataProperty>();
List<DataProperty> dprops = _innerIndividual.getPopulatedDataPropertyList();
if( dprops == null )
return outdProps;
for (DataProperty dp: dprops) {
if (_filters.getDataPropertyStatementFilter().fn(
new DataPropertyStatementImpl(this._innerIndividual.getURI(), dp.getURI(), SOME_LITERAL))) {
@ -106,6 +110,8 @@ public class IndividualFiltering implements Individual {
private List<DataPropertyStatement> filterDataPropertyStatements(List<DataPropertyStatement> dStmts) {
List<DataPropertyStatement> outDstmts = new LinkedList<DataPropertyStatement>();
if( dStmts == null )
return outDstmts;
Filter.filter(dStmts,_filters.getDataPropertyStatementFilter(), outDstmts);
return outDstmts;
}
@ -114,7 +120,7 @@ public class IndividualFiltering implements Individual {
public Map<String, DataProperty> getDataPropertyMap() {
Map<String,DataProperty> innerMap = _innerIndividual.getDataPropertyMap();
if( innerMap == null )
return null;
return Collections.emptyMap();
Map<String,DataProperty> returnMap = new HashMap<String,DataProperty>();
for( String key : innerMap.keySet() ){
@ -136,8 +142,6 @@ public class IndividualFiltering implements Individual {
@Override
public List<ObjectProperty> getObjectPropertyList() {
List <ObjectProperty> oprops = _innerIndividual.getObjectPropertyList();
// List<ObjectProperty> outOProps = new LinkedList<ObjectProperty>();
// Filter.filter(oprops, _filters.getObjectPropertyFilter(), outOProps);
return ObjectPropertyDaoFiltering.filterAndWrap(oprops, _filters);
}
@ -463,6 +467,9 @@ public class IndividualFiltering implements Individual {
@Override
public List<String> getDataValues(String propertyUri) {
List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
if( stmts == null )
return Collections.emptyList();
// Since the statements have been filtered, we can just take the data values without filtering.
List<String> dataValues = new ArrayList<String>(stmts.size());
for (DataPropertyStatement stmt : stmts) {
@ -474,6 +481,9 @@ public class IndividualFiltering implements Individual {
@Override
public String getDataValue(String propertyUri) {
List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
if( stmts == null)
return null;
// Since the statements have been filtered, we can just take the first data value without filtering.
return stmts.isEmpty() ? null : stmts.get(0).getData();
}
@ -481,6 +491,9 @@ public class IndividualFiltering implements Individual {
@Override
public DataPropertyStatement getDataPropertyStatement(String propertyUri) {
List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
if( stmts == null )
return null;
// Since the statements have been filtered, we can just take the first data value without filtering.
return stmts.isEmpty() ? null : stmts.get(0);
}
@ -488,6 +501,9 @@ public class IndividualFiltering implements Individual {
@Override
public List<Individual> getRelatedIndividuals(String propertyUri) {
List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
if( stmts == null)
return Collections.emptyList();
// Since the statements have been filtered, we can just take the individuals without filtering.
List<Individual> relatedIndividuals = new ArrayList<Individual>(stmts.size());
for (ObjectPropertyStatement stmt : stmts) {
@ -499,6 +515,9 @@ public class IndividualFiltering implements Individual {
@Override
public Individual getRelatedIndividual(String propertyUri) {
List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
if( stmts == null )
return null;
// Since the statements have been filtered, we can just take the first individual without filtering.
return stmts.isEmpty() ? null : stmts.get(0).getObject();
}

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.util.HashSet;
import java.util.List;
import org.apache.commons.logging.Log;
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.search.IndexingException;
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;
@ -159,7 +157,7 @@ public class SolrIndexer implements IndexerIface {
log.debug("could not remove documents from before build, " ,e);
}
try {
UpdateResponse res = server.commit();
server.commit();
} catch (Throwable e) {
if( ! shutdownRequested ){
log.debug("could not commit to solr server, " +

12
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.jsoup.Jsoup;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.vocabulary.OWL;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@ -160,6 +161,7 @@ public class IndividualToSolrDocument {
//ALLTEXT, all of the 'full text'
StringBuffer allTextValue = new StringBuffer();
try{
//collecting data property statements
List<DataPropertyStatement> dataPropertyStatements = ind.getDataPropertyStatements();
if (dataPropertyStatements != null) {
@ -178,6 +180,10 @@ public class IndividualToSolrDocument {
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());
@ -209,6 +215,8 @@ public class IndividualToSolrDocument {
*/
protected void addObjectPropertyText(Individual ind, SolrInputDocument doc,
StringBuffer objectNames, StringBuffer addUri) {
try{
List<ObjectPropertyStatement> objectPropertyStatements = ind.getObjectPropertyStatements();
if (objectPropertyStatements != null) {
Iterator<ObjectPropertyStatement> objectPropertyStmtIter = objectPropertyStatements.iterator();
@ -228,6 +236,10 @@ public class IndividualToSolrDocument {
}
}
}
}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()));
}
}
/**