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

NIHVIVO-721 Make indenting consistent. Standardize error logging.

Browse source
This commit is contained in:
jeb228 2010-07-13 20:52:23 +00:00
parent 44df1e5008
commit 0e721dcb22
1 changed files with 93 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
View file

@ -64,104 +64,100 @@ public class LuceneSetup implements javax.servlet.ServletContextListener {
private static String indexDir = null; private static String indexDir = null;
private static final Log log = LogFactory.getLog(LuceneSetup.class.getName()); private static final Log log = LogFactory.getLog(LuceneSetup.class.getName());
/** /**
* Gets run to set up DataSource when the webapp servlet context gets created. * Gets run to set up DataSource when the webapp servlet context gets
*/ * created.
public void contextInitialized(ServletContextEvent sce) { */
try { public void contextInitialized(ServletContextEvent sce) {
ServletContext context = sce.getServletContext(); try {
log.info("**** Running "+this.getClass().getName()+".contextInitialized()"); ServletContext context = sce.getServletContext();
log.info("**** Running " + this.getClass().getName() + ".contextInitialized()");
indexDir = getIndexDirName();
log.info("Directory of full text index: " + indexDir ); indexDir = getIndexDirName();
log.info("Directory of full text index: " + indexDir);
setBoolMax();
setBoolMax();
//these should really be set as annotation properties.
HashSet<String> dataPropertyBlacklist = new HashSet<String>(); // these should really be set as annotation properties.
context.setAttribute(SEARCH_DATAPROPERTY_BLACKLIST, dataPropertyBlacklist); HashSet<String> dataPropertyBlacklist = new HashSet<String>();
HashSet<String> objectPropertyBlacklist = new HashSet<String>(); context.setAttribute(SEARCH_DATAPROPERTY_BLACKLIST, dataPropertyBlacklist);
objectPropertyBlacklist.add("http://www.w3.org/2002/07/owl#differentFrom"); HashSet<String> objectPropertyBlacklist = new HashSet<String>();
context.setAttribute(SEARCH_OBJECTPROPERTY_BLACKLIST, objectPropertyBlacklist); objectPropertyBlacklist.add("http://www.w3.org/2002/07/owl#differentFrom");
context.setAttribute(SEARCH_OBJECTPROPERTY_BLACKLIST, objectPropertyBlacklist);
//Here we want to put the LuceneIndex object into the application scope.
//This will attempt to create a new directory and empty index if there is none. // Here we want to put the LuceneIndex object into the application scope.
LuceneIndexer indexer = new LuceneIndexer(indexDir, null, getAnalyzer()); // This will attempt to create a new directory and empty index if there is none.
context.setAttribute(ANALYZER, getAnalyzer()); LuceneIndexer indexer = new LuceneIndexer(indexDir, null, getAnalyzer());
context.setAttribute(INDEX_DIR, indexDir); context.setAttribute(ANALYZER, getAnalyzer());
indexer.addObj2Doc(new Entity2LuceneDoc()); context.setAttribute(INDEX_DIR, indexDir);
context.setAttribute(LuceneIndexer.class.getName(),indexer); indexer.addObj2Doc(new Entity2LuceneDoc());
context.setAttribute(LuceneIndexer.class.getName(), indexer);
//Here we want to put the LuceneSearcher in the application scope.
// the queries need to know the analyzer to use so that the same one can be used // Here we want to put the LuceneSearcher in the application scope.
// to analyze the fields in the incoming user query terms. // the queries need to know the analyzer to use so that the same one can be used
LuceneSearcher searcher = new LuceneSearcher( // to analyze the fields in the incoming user query terms.
new LuceneQueryFactory(getAnalyzer(), ALLTEXT), LuceneSearcher searcher = new LuceneSearcher(
indexDir); new LuceneQueryFactory(getAnalyzer(), ALLTEXT), indexDir);
searcher.addObj2Doc(new Entity2LuceneDoc()); searcher.addObj2Doc(new Entity2LuceneDoc());
context.setAttribute(Searcher.class.getName(), searcher); context.setAttribute(Searcher.class.getName(), searcher);
indexer.addSearcher(searcher); indexer.addSearcher(searcher);
//This is where the builder gets the list of places to try to // 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 // get objects to index. It is filtered so that non-public text
//does not get into the search index. // does not get into the search index.
WebappDaoFactory wadf = WebappDaoFactory wadf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
(WebappDaoFactory) context.getAttribute("webappDaoFactory"); VitroFilters vf = VitroFilterUtils.getDisplayFilterByRoleLevel(RoleLevel.PUBLIC, wadf);
VitroFilters vf = wadf = new WebappDaoFactoryFiltering(wadf, vf);
VitroFilterUtils.getDisplayFilterByRoleLevel(RoleLevel.PUBLIC, wadf);
wadf = new WebappDaoFactoryFiltering(wadf,vf); List<ObjectSourceIface> sources = new ArrayList<ObjectSourceIface>();
sources.add(wadf.getIndividualDao());
List<ObjectSourceIface> sources = new ArrayList<ObjectSourceIface>();
sources.add(wadf.getIndividualDao()); IndexBuilder builder = new IndexBuilder(context, indexer, sources);
IndexBuilder builder = new IndexBuilder(context,indexer,sources); // here we add the IndexBuilder with the LuceneIndexer
// to the servlet context so we can access it later in the webapp.
// here we add the IndexBuilder with the LuceneIndexer context.setAttribute(IndexBuilder.class.getName(), builder);
// 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
OntModel baseOntModel = (OntModel) sce.getServletContext().getAttribute("baseOntModel");
//set up listeners so search index builder is notified of changes to model OntModel jenaOntModel = (OntModel) sce.getServletContext().getAttribute("jenaOntModel");
OntModel baseOntModel = (OntModel)sce.getServletContext().getAttribute("baseOntModel"); OntModel inferenceModel = (OntModel) sce.getServletContext().getAttribute("inferenceOntModel");
OntModel jenaOntModel = (OntModel)sce.getServletContext().getAttribute("jenaOntModel"); SearchReindexingListener srl = new SearchReindexingListener(builder);
OntModel inferenceModel = (OntModel) sce.getServletContext().getAttribute("inferenceOntModel"); baseOntModel.getBaseModel().register(srl);
SearchReindexingListener srl = new SearchReindexingListener(builder); jenaOntModel.getBaseModel().register(srl);
baseOntModel.getBaseModel().register(srl); inferenceModel.register(srl);
jenaOntModel.getBaseModel().register(srl);
inferenceModel.register(srl); // set the classes that the indexBuilder ignores
OntModel displayOntModel = (OntModel) sce.getServletContext().getAttribute("displayOntModel");
//set the classes that the indexBuilder ignores builder.setClassesProhibitedFromSearch(
OntModel displayOntModel = (OntModel)sce.getServletContext().getAttribute("displayOntModel"); new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel));
builder.setClassesProhibitedFromSearch(
new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel)); log.debug("**** End of " + this.getClass().getName() + ".contextInitialized()");
} catch (Throwable t) {
log.debug("**** End of "+this.getClass().getName()+".contextInitialized()"); log.error("***** Error setting up Lucene search *****", t);
} catch (Throwable t) { }
log.error(t); }
System.out.println("***** Error setting up Lucene search *****");
t.printStackTrace(); // because Tomcat doesn't display listener errors in catalina.out, at least by default
}
}
/** /**
* Gets run when the webApp Context gets destroyed. * Gets run when the webApp Context gets destroyed.
*/ */
public void contextDestroyed(ServletContextEvent sce) { public void contextDestroyed(ServletContextEvent sce) {
log.info("**** Running "+this.getClass().getName()+".contextDestroyed()"); log.info("**** Running " + this.getClass().getName() + ".contextDestroyed()");
IndexBuilder builder = (IndexBuilder)sce.getServletContext().getAttribute(IndexBuilder.class.getName()); IndexBuilder builder = (IndexBuilder) sce.getServletContext().getAttribute(IndexBuilder.class.getName());
builder.killIndexingThread(); builder.killIndexingThread();
} }
/** /**
* In wild card searches the query is first broken into many boolean searches * In wild card searches the query is first broken into many boolean
* OR'ed together. So if there is a query that would match a lot of records * searches OR'ed together. So if there is a query that would match a lot of
* we need a high max boolean limit for the lucene search. * records we need a high max boolean limit for the lucene search.
* *
* This sets some static method in the lucene library to achieve this. * This sets some static method in the lucene library to achieve this.
*/ */
public static void setBoolMax() { public static void setBoolMax() {
BooleanQuery.setMaxClauseCount(16384); BooleanQuery.setMaxClauseCount(16384);
} }
/** /**
* Gets the name of the directory to store the lucene index in. The * Gets the name of the directory to store the lucene index in. The
* {@link ConfigurationProperties} should have a property named * {@link ConfigurationProperties} should have a property named