gibheer/bleve
0
0
Fork 0
Code

more correct fix, handles case where validate is called

Browse Source
This commit is contained in:
Marty Schoch 2016-01-21 17:26:24 -05:00
parent 311a503d47
commit f0d6abff6f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
query_regexp.go
View File

@ -58,6 +58,19 @@ func (q *regexpQuery) Searcher(i index.IndexReader, m *IndexMapping, explain boo
if q.FieldVal == "" { if q.FieldVal == "" {
field = m.DefaultField field = m.DefaultField
} }
err := q.compile()
if err != nil {
return nil, err
}
return searchers.NewRegexpSearcher(i, q.compiled, field, q.BoostVal, explain)
}
func (q *regexpQuery) Validate() error {
return q.compile()
}
func (q *regexpQuery) compile() error {
if q.compiled == nil { if q.compiled == nil {
// require that pattern be anchored to start and end of term // require that pattern be anchored to start and end of term
actualRegexp := q.Regexp actualRegexp := q.Regexp
@ -70,15 +83,8 @@ func (q *regexpQuery) Searcher(i index.IndexReader, m *IndexMapping, explain boo
var err error var err error
q.compiled, err = regexp.Compile(actualRegexp) q.compiled, err = regexp.Compile(actualRegexp)
if err != nil { if err != nil {
return nil, err return err
} }
} }
return nil
return searchers.NewRegexpSearcher(i, q.compiled, field, q.BoostVal, explain)
}
func (q *regexpQuery) Validate() error {
var err error
q.compiled, err = regexp.Compile(q.Regexp)
return err
} }