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

Moving around some classes for AdditionalURIsForContextNodes NIHVIVO-2834

Browse source
This commit is contained in:
briancaruso 2011-07-14 20:13:44 +00:00
parent 2dedb88c66
commit 4736eadd71
9 changed files with 76 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/AdditionalURIsToIndex.java Normal file
View file

@ -0,0 +1,15 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.beans;
import java.util.List;
import com.hp.hpl.jena.rdf.model.Statement;
/**
* Interface to use with IndexBuilder to find more URIs to index given a changed statement.
* The stmt may have been added or removed from the model.
*/
public interface AdditionalURIsToIndex {
List<String> findAdditionalURIsToIndex(Statement stmt);
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexerIface.java → webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/IndexerIface.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.indexing;
package edu.cornell.mannlib.vitro.webapp.search.beans;
import java.util.List;

32
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodes.java
View file

@ -22,8 +22,11 @@ import com.hp.hpl.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.search.beans.AdditionalURIsToIndex;
public class AdditionalURIsForContextNodes implements AdditionalURIsToIndex {
private OntModel model;
@ -39,8 +42,30 @@ public class AdditionalURIsForContextNodes implements AdditionalURIsToIndex {
}
@Override
public List<String> findAdditionalURIsToIndex(String uri) {
public List<String> findAdditionalURIsToIndex(Statement stmt) {
if( stmt != null ){
List<String>urisToIndex = new ArrayList<String>();
if(stmt.getSubject() != null && stmt.getSubject().isURIResource() ){
String subjUri = stmt.getSubject().getURI();
if( subjUri != null){
urisToIndex.addAll( findAdditionalURIsToIndex(subjUri));
}
}
if( stmt.getObject() != null && stmt.getObject().isURIResource() ){
String objUri = stmt.getSubject().getURI();
if( objUri != null){
urisToIndex.addAll( findAdditionalURIsToIndex(objUri));
}
}
return urisToIndex;
}else{
return Collections.emptyList();
}
}
protected List<String> findAdditionalURIsToIndex(String uri) {
List<String> uriList = new ArrayList<String>();
@ -307,4 +332,7 @@ public class AdditionalURIsForContextNodes implements AdditionalURIsToIndex {
queryList = Collections.unmodifiableList(tmpList);
}
}

13
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsToIndex.java
View file

@ -1,13 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.indexing;
import java.util.List;
/**
* Interface to use with IndexBuilder to find more URIs to index given a URI.
*
*/
public interface AdditionalURIsToIndex {
List<String> findAdditionalURIsToIndex(String uri);
}

25
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
View file

@ -19,6 +19,8 @@ import com.hp.hpl.jena.query.QueryParseException;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.search.beans.AdditionalURIsToIndex;
import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface;
/**
@ -50,7 +52,6 @@ public class IndexBuilder extends Thread {
protected long reindexInterval = 1000 * 60 /* msec */ ;
protected int numberOfThreads = 10;
protected List<AdditionalURIsToIndex> additionalURIsFinders;
public static final boolean UPDATE_DOCS = false;
public static final boolean NEW_DOCS = true;
@ -60,20 +61,18 @@ public class IndexBuilder extends Thread {
public IndexBuilder(
ServletContext context,
IndexerIface indexer,
WebappDaoFactory wdf,
List<AdditionalURIsToIndex> additionalURIsFinders){
WebappDaoFactory wdf ){
super("IndexBuilder");
this.indexer = indexer;
this.wdf = wdf;
this.context = context;
this.additionalURIsFinders = additionalURIsFinders;
this.changedUris = new HashSet<String>();
this.start();
}
protected IndexBuilder(){
//for testing only
this( null, null, null, null);
this( null, null, null);
}
public void setWdf(WebappDaoFactory wdf){
@ -173,9 +172,7 @@ public class IndexBuilder extends Thread {
/**
* Sets updatedUris and deletedUris lists.
*/
private void makeAddAndDeleteLists( Collection<String> uris){
uris.addAll(getAdditionalURIsToIndex(uris));
private void makeAddAndDeleteLists( Collection<String> uris){
/* clear updateInds and deletedUris. This is the only method that should set these. */
this.updatedInds = new ArrayList<String>();
@ -197,18 +194,6 @@ public class IndexBuilder extends Thread {
}
}
}
private Set<String> getAdditionalURIsToIndex(Collection<String> uris) {
Set<String> listOfAdditionalURIs = new HashSet<String>();
for(String uri: uris){
//grab the uris from AdditionalURIsToIndex
listOfAdditionalURIs.addAll(additionalURIsFinders.get(0).findAdditionalURIsToIndex(uri));
}
return listOfAdditionalURIs;
}
/**
* This rebuilds the whole index.

1
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java
View file

@ -9,6 +9,7 @@ import org.apache.commons.logging.LogFactory;
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.solr.IndividualToSolrDocument;
class IndexWorkerThread extends Thread{

18
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SearchReindexingListener.java → webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/SearchReindexingListener.java
View file

@ -1,7 +1,8 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.dao.jena;
package edu.cornell.mannlib.vitro.webapp.search.indexing;
import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
@ -15,7 +16,7 @@ import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
import edu.cornell.mannlib.vitro.webapp.search.beans.AdditionalURIsToIndex;
/**
* This class is thread safe. Notice that doAsyncIndexBuild() is frequently
@ -23,11 +24,16 @@ import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
*/
public class SearchReindexingListener implements ModelChangedListener {
private IndexBuilder indexBuilder;
private List<AdditionalURIsToIndex> additionalUriFinders;
public SearchReindexingListener(IndexBuilder indexBuilder) {
public SearchReindexingListener(IndexBuilder indexBuilder, List<AdditionalURIsToIndex> addUrisList ) {
if(indexBuilder == null )
throw new IllegalArgumentException("Constructor parameter indexBuilder must not be null");
this.indexBuilder = indexBuilder;
this.indexBuilder = indexBuilder;
if( addUrisList != null )
this.additionalUriFinders = addUrisList;
else
this.additionalUriFinders = Collections.emptyList();
}
private synchronized void addChange(Statement stmt){
@ -59,6 +65,10 @@ public class SearchReindexingListener implements ModelChangedListener {
if( stmt.getObject().isURIResource() ){
indexBuilder.addToChangedUris(((Resource) stmt.getObject()).getURI());
}
for( AdditionalURIsToIndex au : additionalUriFinders ){
indexBuilder.addToChangedUris( au.findAdditionalURIsToIndex(stmt) );
}
}
private void requestAsyncIndexUpdate(){

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

@ -18,8 +18,8 @@ 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.indexing.IndexerIface;
public class SolrIndexer implements IndexerIface {

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

@ -27,14 +27,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilterUtils;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
import edu.cornell.mannlib.vitro.webapp.dao.jena.SearchReindexingListener;
import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
import edu.cornell.mannlib.vitro.webapp.search.IndexConstants;
import edu.cornell.mannlib.vitro.webapp.search.beans.AdditionalURIsToIndex;
import edu.cornell.mannlib.vitro.webapp.search.beans.IndividualProhibitedFromSearchImpl;
import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
import edu.cornell.mannlib.vitro.webapp.search.indexing.AdditionalURIsForContextNodes;
import edu.cornell.mannlib.vitro.webapp.search.indexing.AdditionalURIsToIndex;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
import edu.cornell.mannlib.vitro.webapp.search.indexing.SearchReindexingListener;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.AbortStartup;
public class SolrSetup implements javax.servlet.ServletContextListener{
@ -61,8 +61,8 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
return;
}
CommonsHttpSolrServer server;
//It would be nice to use the default binary handler but there seem to be library problems
server = new CommonsHttpSolrServer(new URL( solrServerUrl ),null,new XMLResponseParser(),false);
//server = new CommonsHttpSolrServer(new URL( solrServerUrl ));
server.setSoTimeout(10000); // socket read timeout
server.setConnectionTimeout(10000);
server.setDefaultMaxConnectionsPerHost(100);
@ -90,11 +90,7 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
modifiers);
/* setup solr indexer */
SolrIndexer solrIndexer = new SolrIndexer(server, indToSolrDoc);
/* if( solrIndexer.isIndexEmpty() ){
log.info("solr index is empty, requesting rebuild");
sce.getServletContext().setAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP, Boolean.TRUE);
} */
SolrIndexer solrIndexer = new SolrIndexer(server, indToSolrDoc);
// This is where the builder gets the list of places to try to
// get objects to index. It is filtered so that non-public text
@ -102,32 +98,19 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
WebappDaoFactory wadf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
VitroFilters vf = VitroFilterUtils.getPublicFilter(context);
wadf = new WebappDaoFactoryFiltering(wadf, vf);
IndexBuilder builder = new IndexBuilder(context, solrIndexer, wadf );
// to the servlet context so we can access it later in the webapp.
context.setAttribute(IndexBuilder.class.getName(), builder);
//make objects that will find additional URIs for context nodes etc
List<AdditionalURIsToIndex> uriFinders = new ArrayList<AdditionalURIsToIndex>();
uriFinders.add( new AdditionalURIsForContextNodes(jenaOntModel) );
IndexBuilder builder = new IndexBuilder(context, solrIndexer, wadf, uriFinders);
// to the servlet context so we can access it later in the webapp.
context.setAttribute(IndexBuilder.class.getName(), builder);
// set up listeners so search index builder is notified of changes to model
ServletContext ctx = sce.getServletContext();
SearchReindexingListener srl = new SearchReindexingListener(builder);
SearchReindexingListener srl = new SearchReindexingListener(builder, uriFinders);
ModelContext.registerListenerForChanges(ctx, srl);
/* if( sce.getServletContext().getAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP) instanceof Boolean &&
(Boolean)sce.getServletContext().getAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP) ){
log.info("Rebuild of solr index required before startup.");
builder.doIndexRebuild();
int n = 0;
while( builder.isReindexRequested() || builder.isIndexing() ){
n++;
if( n % 20 == 0 ) //output message every 10 sec.
log.info("Still rebuilding solr index");
Thread.sleep(500);
}
}*/
log.info("Setup of Solr index completed.");
} catch (Throwable e) {