diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java index c44b7055a..dacac86af 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java @@ -190,7 +190,7 @@ public class LuceneSetup implements javax.servlet.ServletContextListener { * * @return */ - public Analyzer getAnalyzer() { + private Analyzer getAnalyzer() { PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper( new KeywordAnalyzer()); analyzer.addAnalyzer(Entity2LuceneDoc.term.ALLTEXT, new HtmlLowerStopStemAnalyzer()); analyzer.addAnalyzer(Entity2LuceneDoc.term.NAME, new HtmlLowerStopStemAnalyzer()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/VitroAnalyzer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/VitroAnalyzer.java deleted file mode 100644 index 8652cfefa..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/VitroAnalyzer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.search.lucene; - -import java.io.Reader; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.KeywordAnalyzer; -import org.apache.lucene.analysis.TokenStream; - -public class VitroAnalyzer extends Analyzer { - Analyzer keywordAnalyzer; - Analyzer stemmingAnalyzer; - Analyzer nonStemmingAnalyzer; - - public VitroAnalyzer(){ - keywordAnalyzer = new KeywordAnalyzer(); - stemmingAnalyzer = new HtmlLowerStopStemAnalyzer(); - nonStemmingAnalyzer = new HtmlLowerStopAnalyzer(); - } - - @Override - public TokenStream tokenStream(String field, Reader reader) { - if( Entity2LuceneDoc.term.ALLTEXT.equals(field) || - Entity2LuceneDoc.term.NAME.equals(field) ) - return stemmingAnalyzer.tokenStream(field, reader); - else if( Entity2LuceneDoc.term.ALLTEXTUNSTEMMED.equals(field) || - Entity2LuceneDoc.term.NAMEUNSTEMMED.equals(field) ) - return nonStemmingAnalyzer.tokenStream(field, reader); - else{ - return keywordAnalyzer.tokenStream(field, reader); - } - } - -} \ No newline at end of file