From eeaf514848cdcc9715e95cd2b68b3ef3b19e59bc Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Wed, 11 Mar 2015 11:46:33 -0400 Subject: [PATCH] switch fr to not require icu/libstemmer also corrected copy/paste bug in test --- analysis/language/fr/analyzer_fr.go | 9 +++------ analysis/language/fr/analyzer_fr_test.go | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/analysis/language/fr/analyzer_fr.go b/analysis/language/fr/analyzer_fr.go index 7b8f8741..6c6f60f3 100644 --- a/analysis/language/fr/analyzer_fr.go +++ b/analysis/language/fr/analyzer_fr.go @@ -7,9 +7,6 @@ // either express or implied. See the License for the specific language governing permissions // and limitations under the License. -// +build libstemmer full -// +build icu full - package fr import ( @@ -17,13 +14,13 @@ import ( "github.com/blevesearch/bleve/registry" "github.com/blevesearch/bleve/analysis/token_filters/lower_case_filter" - "github.com/blevesearch/bleve/analysis/tokenizers/icu" + "github.com/blevesearch/bleve/analysis/tokenizers/unicode" ) const AnalyzerName = "fr" func AnalyzerConstructor(config map[string]interface{}, cache *registry.Cache) (*analysis.Analyzer, error) { - icuTokenizer, err := cache.TokenizerNamed(icu.Name) + tokenizer, err := cache.TokenizerNamed(unicode.Name) if err != nil { return nil, err } @@ -44,7 +41,7 @@ func AnalyzerConstructor(config map[string]interface{}, cache *registry.Cache) ( return nil, err } rv := analysis.Analyzer{ - Tokenizer: icuTokenizer, + Tokenizer: tokenizer, TokenFilters: []analysis.TokenFilter{ elisionFilter, toLowerFilter, diff --git a/analysis/language/fr/analyzer_fr_test.go b/analysis/language/fr/analyzer_fr_test.go index 91580fe7..cfb500b5 100644 --- a/analysis/language/fr/analyzer_fr_test.go +++ b/analysis/language/fr/analyzer_fr_test.go @@ -7,9 +7,6 @@ // either express or implied. See the License for the specific language governing permissions // and limitations under the License. -// +build libstemmer full -// +build icu full - package fr import ( @@ -171,7 +168,7 @@ func TestFrenchAnalyzer(t *testing.T) { Term: []byte("ïaöuaä"), }, &analysis.Token{ - Term: []byte("anticonstitutionel'hui"), + Term: []byte("anticonstitutionel"), }, &analysis.Token{ Term: []byte("java"),