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

Changed deprecated method signatures to new ones.

Browse source
This commit is contained in:
deepakkoni 2011-03-22 11:29:05 +00:00
parent f8688ff457
commit d093c0b1bf
4 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -38,6 +38,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.util.Version;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@ -690,7 +691,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
// map.put(Entity2LuceneDoc.term.ALLTEXT,Entity2LuceneDoc.term.ALLTEXTUNSTEMMED); // map.put(Entity2LuceneDoc.term.ALLTEXT,Entity2LuceneDoc.term.ALLTEXTUNSTEMMED);
// qp.setStemmedToUnstemmed(map); // qp.setStemmedToUnstemmed(map);
MultiFieldQueryParser qp = new MultiFieldQueryParser(new String[]{ "name", "nameunstemmed", "type", "moniker", "ALLTEXT", "ALLTEXTUNSTEMMED", "nameraw" }, analyzer); MultiFieldQueryParser qp = new MultiFieldQueryParser(Version.LUCENE_29, new String[]{ "name", "nameunstemmed", "type", "moniker", "ALLTEXT", "ALLTEXTUNSTEMMED", "nameraw" }, analyzer);
qp.setDefaultOperator(QueryParser.AND_OPERATOR); qp.setDefaultOperator(QueryParser.AND_OPERATOR);

27
webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/HtmlLowerStopAnalyzer.java
View file

@ -3,14 +3,19 @@
package edu.cornell.mannlib.vitro.webapp.search.lucene; package edu.cornell.mannlib.vitro.webapp.search.lucene;
import java.io.Reader; import java.io.Reader;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.lucene.analysis.ASCIIFoldingFilter;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.ISOLatin1AccentFilter;
import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.LowerCaseFilter;
import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.util.Version;
public class HtmlLowerStopAnalyzer extends Analyzer { public class HtmlLowerStopAnalyzer extends Analyzer {
/* much of this code is from /* much of this code is from
@ -18,7 +23,7 @@ public class HtmlLowerStopAnalyzer extends Analyzer {
* bdc34 * bdc34
*/ */
private static String[] _stopWords; private static Set<String> _stopWords;
/** /**
* An array containing some common English words * An array containing some common English words
@ -52,13 +57,16 @@ public class HtmlLowerStopAnalyzer extends Analyzer {
"j", "k", "l", "m", "n", "o", "p", "q", "r", "j", "k", "l", "m", "n", "o", "p", "q", "r",
"s", "t", "u", "v", "w", "x", "y", "z" "s", "t", "u", "v", "w", "x", "y", "z"
}; };
public static final List<String> stopWordsList = Arrays.asList(STOP_WORDS);
public static final Set<String> STOP_WORDS_SET = new HashSet<String>(stopWordsList);
/** /**
* Builds an analyzer. * Builds an analyzer.
*/ */
public HtmlLowerStopAnalyzer() public HtmlLowerStopAnalyzer()
{ {
this(STOP_WORDS); this(STOP_WORDS_SET);
} }
/** /**
@ -66,9 +74,9 @@ public class HtmlLowerStopAnalyzer extends Analyzer {
* *
* @param stopWords a String array of stop words * @param stopWords a String array of stop words
*/ */
public HtmlLowerStopAnalyzer(String[] stopWords) public HtmlLowerStopAnalyzer(Set<String> stopWords)
{ {
_stopWords = stopWords; _stopWords = STOP_WORDS_SET;
} }
/** /**
@ -99,15 +107,16 @@ public class HtmlLowerStopAnalyzer extends Analyzer {
// return stopFilter; // return stopFilter;
// //
TokenStream result = new StandardTokenizer(arg0); TokenStream result = new StandardTokenizer(Version.LUCENE_29, arg0);
result = new StandardFilter(result); //break into tokens result = new StandardFilter(result); //break into tokens
result = new LowerCaseFilter(result); //lower case result = new LowerCaseFilter(result); //lower case
result = new StopFilter(result, _stopWords, IGNORE_CASE); //remove stop words result = new StopFilter(ENABLE_POSITION_INCREMENTS, result, STOP_WORDS_SET, IGNORE_CASE); //remove stop words
result = new ISOLatin1AccentFilter(result); //ISO-8859-1 accented chars are replace by unaccented result = new ASCIIFoldingFilter(result); //this class converts alphabetic, symbolic and numerical characters into their ASCII equivalents.
return result; return result;
} }
private static final boolean IGNORE_CASE = true; private static final boolean IGNORE_CASE = true;
private static final boolean ENABLE_POSITION_INCREMENTS = false;
} }

3
webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/HtmlLowerStopStemAnalyzer.java
View file

@ -3,6 +3,7 @@
package edu.cornell.mannlib.vitro.webapp.search.lucene; package edu.cornell.mannlib.vitro.webapp.search.lucene;
import java.io.Reader; import java.io.Reader;
import java.util.Set;
import org.apache.lucene.analysis.PorterStemFilter; import org.apache.lucene.analysis.PorterStemFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
@ -19,7 +20,7 @@ public class HtmlLowerStopStemAnalyzer extends HtmlLowerStopAnalyzer {
super(); super();
} }
public HtmlLowerStopStemAnalyzer(String[] stopWords){ public HtmlLowerStopStemAnalyzer(Set<String> stopWords){
super(stopWords); super(stopWords);
} }

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

@ -24,6 +24,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper; import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.util.Version;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
@ -230,14 +231,14 @@ public class LuceneSetup implements javax.servlet.ServletContextListener {
* @return * @return
*/ */
private Analyzer getAnalyzer() { private Analyzer getAnalyzer() {
PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper( new StandardAnalyzer()); PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper( new StandardAnalyzer(Version.LUCENE_29));
analyzer.addAnalyzer(ALLTEXT, new HtmlLowerStopStemAnalyzer()); analyzer.addAnalyzer(ALLTEXT, new HtmlLowerStopStemAnalyzer());
analyzer.addAnalyzer(NAME, new HtmlLowerStopStemAnalyzer()); analyzer.addAnalyzer(NAME, new HtmlLowerStopStemAnalyzer());
analyzer.addAnalyzer(ALLTEXTUNSTEMMED, new HtmlLowerStopAnalyzer()); analyzer.addAnalyzer(ALLTEXTUNSTEMMED, new HtmlLowerStopAnalyzer());
analyzer.addAnalyzer(NAMEUNSTEMMED, new HtmlLowerStopAnalyzer()); analyzer.addAnalyzer(NAMEUNSTEMMED, new HtmlLowerStopAnalyzer());
analyzer.addAnalyzer(NAME, new StandardAnalyzer()); analyzer.addAnalyzer(NAME, new StandardAnalyzer(Version.LUCENE_29));
analyzer.addAnalyzer(MONIKER, new StandardAnalyzer()); analyzer.addAnalyzer(MONIKER, new StandardAnalyzer(Version.LUCENE_29));
analyzer.addAnalyzer(RDFTYPE, new StandardAnalyzer()); analyzer.addAnalyzer(RDFTYPE, new StandardAnalyzer(Version.LUCENE_29));
return analyzer; return analyzer;
} }