Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed call to SolrCore.log and SolrCore import. 

Replaced reference to java.io.File with File


git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@680936 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2008-07-30 08:24:07 +00:00
parent 4ac6ce3190
commit 842680f15d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/org/apache/solr/analysis/SynonymFilterFactory.java
View File

@ -21,14 +21,12 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.common.ResourceLoader; import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.util.StrUtils; import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.plugin.ResourceLoaderAware; import org.apache.solr.util.plugin.ResourceLoaderAware;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.io.StringReader; import java.io.StringReader;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -37,7 +35,7 @@ import java.util.Map;
* @version $Id$ * @version $Id$
*/ */
public class SynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware { public class SynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public void inform(ResourceLoader loader) { public void inform(ResourceLoader loader) {
String synonyms = args.get("synonyms"); String synonyms = args.get("synonyms");
@ -53,7 +51,7 @@ public class SynonymFilterFactory extends BaseTokenFilterFactory implements Reso
if (synonyms != null) { if (synonyms != null) {
List<String> wlist=null; List<String> wlist=null;
try { try {
File synonymFile = new java.io.File(synonyms); File synonymFile = new File(synonyms);
if (synonymFile.exists()) { if (synonymFile.exists()) {
wlist = loader.getLines(synonyms); wlist = loader.getLines(synonyms);
} else { } else {
@ -67,9 +65,6 @@ public class SynonymFilterFactory extends BaseTokenFilterFactory implements Reso
} }
synMap = new SynonymMap(ignoreCase); synMap = new SynonymMap(ignoreCase);
parseRules(wlist, synMap, "=>", ",", expand,tokFactory); parseRules(wlist, synMap, "=>", ",", expand,tokFactory);
if (wlist.size()<=20) {
SolrCore.log.fine("SynonymMap "+synonyms +":"+synMap);
}
} }
} }
@ -132,7 +127,7 @@ public class SynonymFilterFactory extends BaseTokenFilterFactory implements Reso
} }
return synList; return synList;
} }
private static List<String> splitByTokenizer(String source, TokenizerFactory tokFactory){ private static List<String> splitByTokenizer(String source, TokenizerFactory tokFactory){
StringReader reader = new StringReader( source ); StringReader reader = new StringReader( source );
TokenStream ts = loadTokenizer(tokFactory, reader); TokenStream ts = loadTokenizer(tokFactory, reader);
@ -157,14 +152,14 @@ public class SynonymFilterFactory extends BaseTokenFilterFactory implements Reso
tokFactory.init( args ); tokFactory.init( args );
return tokFactory; return tokFactory;
} }
private static TokenStream loadTokenizer(TokenizerFactory tokFactory, Reader reader){ private static TokenStream loadTokenizer(TokenizerFactory tokFactory, Reader reader){
return tokFactory.create( reader ); return tokFactory.create( reader );
} }
public SynonymMap getSynonymMap() { public SynonymMap getSynonymMap() {
return synMap; return synMap;
} }
public SynonymFilter create(TokenStream input) { public SynonymFilter create(TokenStream input) {
return new SynonymFilter(input,synMap); return new SynonymFilter(input,synMap);