honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Analysis: When specifying empty array for stopwords, use an empty list for stopwords, closes #230.

Browse Source
This commit is contained in:
kimchy 2010-06-18 00:34:18 +03:00
parent 8e4c139c8b
commit 22926f0026
14 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/Settings.java
View File

@ -221,6 +221,14 @@ public interface Settings {
*/
String[] getAsArray(String settingPrefix, String[] defaultArray) throws SettingsException;
/**
* The values associated with a setting prefix as an array. The settings array is in the format of:
* <tt>settingPrefix.[index]</tt>.
*
* @param settingPrefix The setting prefix to load the array by
* @return The setting array values
* @throws SettingsException
*/
String[] getAsArray(String settingPrefix) throws SettingsException;
/**

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class ArabicAnalyzerProvider extends AbstractIndexAnalyzerProvider<Arabic
@Inject public ArabicAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = ArabicAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java
View File

@ -44,8 +44,8 @@ public class BrazilianAnalyzerProvider extends AbstractIndexAnalyzerProvider<Bra
@Inject public BrazilianAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = BrazilianAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class CjkAnalyzerProvider extends AbstractIndexAnalyzerProvider<CJKAnalyz
@Inject public CjkAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = CJKAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class CzechAnalyzerProvider extends AbstractIndexAnalyzerProvider<CzechAn
@Inject public CzechAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = CzechAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java
View File

@ -44,8 +44,8 @@ public class DutchAnalyzerProvider extends AbstractIndexAnalyzerProvider<DutchAn
@Inject public DutchAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = DutchAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java
View File

@ -44,8 +44,8 @@ public class FrenchAnalyzerProvider extends AbstractIndexAnalyzerProvider<French
@Inject public FrenchAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = FrenchAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java
View File

@ -44,8 +44,8 @@ public class GermanAnalyzerProvider extends AbstractIndexAnalyzerProvider<German
@Inject public GermanAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = GermanAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class GreekAnalyzerProvider extends AbstractIndexAnalyzerProvider<GreekAn
@Inject public GreekAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = GreekAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class PersianAnalyzerProvider extends AbstractIndexAnalyzerProvider<Persi
@Inject public PersianAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = PersianAnalyzer.getDefaultStopSet();

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java
View File

@ -38,8 +38,8 @@ public class RussianAnalyzerProvider extends AbstractIndexAnalyzerProvider<Russi
@Inject public RussianAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
analyzer = new RussianAnalyzer(Lucene.ANALYZER_VERSION, ImmutableSet.copyOf(Iterators.forArray(stopWords)));
} else {
analyzer = new RussianAnalyzer(Lucene.ANALYZER_VERSION);

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java
View File

@ -45,8 +45,8 @@ public class StandardAnalyzerProvider extends AbstractIndexAnalyzerProvider<Stan
@Inject public StandardAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = ImmutableSet.copyOf((Iterable<? extends String>) StopAnalyzer.ENGLISH_STOP_WORDS_SET);

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java
View File

@ -42,8 +42,8 @@ public class StopAnalyzerProvider extends AbstractIndexAnalyzerProvider<StopAnal
@Inject public StopAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = ImmutableSet.copyOf((Iterable<? extends String>) StopAnalyzer.ENGLISH_STOP_WORDS_SET);

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java
View File

@ -45,8 +45,8 @@ public class StopTokenFilterFactory extends AbstractTokenFilterFactory {
@Inject public StopTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name);
String[] stopWords = settings.getAsArray("stopwords");
if (stopWords.length > 0) {
String[] stopWords = settings.getAsArray("stopwords", null);
if (stopWords != null) {
this.stopWords = ImmutableSet.copyOf(Iterators.forArray(stopWords));
} else {
this.stopWords = ImmutableSet.copyOf((Iterable<? extends String>) StopAnalyzer.ENGLISH_STOP_WORDS_SET);