gibheer
/
bleve
0
0
Fork 0
Code

exception: fail if pattern is empty, name tokenizer in error

This commit is contained in:
Patrick Mezard 2015-10-27 17:42:02 +01:00
parent 54a85fa96a
commit f95f1d29a0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
analysis/tokenizers/exception/exception.go
View File

@ -111,6 +111,9 @@ func ExceptionsTokenizerConstructor(config map[string]interface{}, cache *regist
if ok {
exceptions = append(exceptions, aexceptions...)
}
if len(exceptions) == 0 {
return nil, fmt.Errorf("no pattern found in 'exception' property")
}
exceptionPattern := strings.Join(exceptions, "|")
r, err := regexp.Compile(exceptionPattern)
if err != nil {

4
registry/tokenizer.go
View File

@ -38,7 +38,7 @@ func (c TokenizerCache) TokenizerNamed(name string, cache *Cache) (analysis.Toke
}
tokenizer, err := tokenizerConstructor(nil, cache)
if err != nil {
return nil, fmt.Errorf("error building tokenizer: %v", err)
return nil, fmt.Errorf("error building tokenizer '%s': %v", name, err)
}
c[name] = tokenizer
return tokenizer, nil
@ -55,7 +55,7 @@ func (c TokenizerCache) DefineTokenizer(name string, typ string, config map[stri
}
tokenizer, err := tokenizerConstructor(config, cache)
if err != nil {
return nil, fmt.Errorf("error building tokenizer: %v", err)
return nil, fmt.Errorf("error building tokenizer '%s': %v", name, err)
}
c[name] = tokenizer
return tokenizer, nil