honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Analysis: Phonetic filter `replace` flag is inverted, fix (changes default behavior now, to follow docs), closes #1127.

This commit is contained in:
kimchy 2011-07-18 21:29:29 +03:00
parent 685f7c7d84
commit 04086985f4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/phonetic/PhoneticTokenFilterFactory.java
View File

@ -22,7 +22,13 @@ package org.elasticsearch.index.analysis.phonetic;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.codec.Encoder; import org.elasticsearch.common.codec.Encoder;
import org.elasticsearch.common.codec.language.*; import org.elasticsearch.common.codec.language.Caverphone1;
import org.elasticsearch.common.codec.language.Caverphone2;
import org.elasticsearch.common.codec.language.ColognePhonetic;
import org.elasticsearch.common.codec.language.DoubleMetaphone;
import org.elasticsearch.common.codec.language.Metaphone;
import org.elasticsearch.common.codec.language.RefinedSoundex;
import org.elasticsearch.common.codec.language.Soundex;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.inject.assistedinject.Assisted; import org.elasticsearch.common.inject.assistedinject.Assisted;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -39,11 +45,11 @@ public class PhoneticTokenFilterFactory extends AbstractTokenFilterFactory {
private final Encoder encoder; private final Encoder encoder;
private final boolean inject; private final boolean replace;
@Inject public PhoneticTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) { @Inject public PhoneticTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name, settings); super(index, indexSettings, name, settings);
this.inject = settings.getAsBoolean("replace", true); this.replace = settings.getAsBoolean("replace", true);
String encoder = settings.get("encoder"); String encoder = settings.get("encoder");
if (encoder == null) { if (encoder == null) {
throw new ElasticSearchIllegalArgumentException("encoder must be set on phonetic token filter"); throw new ElasticSearchIllegalArgumentException("encoder must be set on phonetic token filter");
@ -73,8 +79,8 @@ public class PhoneticTokenFilterFactory extends AbstractTokenFilterFactory {
@Override public TokenStream create(TokenStream tokenStream) { @Override public TokenStream create(TokenStream tokenStream) {
if (encoder instanceof DoubleMetaphone) { if (encoder instanceof DoubleMetaphone) {
return new DoubleMetaphoneFilter(tokenStream, (DoubleMetaphone) encoder, inject); return new DoubleMetaphoneFilter(tokenStream, (DoubleMetaphone) encoder, !replace);
} }
return new PhoneticFilter(tokenStream, encoder, name(), inject); return new PhoneticFilter(tokenStream, encoder, name(), !replace);
} }
} }