gibheer/bleve
0
0
Fork 0
Code

fix bug in simple highlighter

Browse Source 
when requesting highligh of a field with matches would crash
This commit is contained in:
Marty Schoch 2014-07-11 14:25:32 -04:00
parent 2c86a731b4
commit 1fac31ac9c
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
search/highlighter_simple.go
View File

@ -75,29 +75,31 @@ func (s *SimpleHighlighter) BestFragmentsInField(dm *DocumentMatch, doc *documen
// now find the N best non-overlapping fragments
bestFragments := make([]*Fragment, 0)
candidate := heap.Pop(&fq)
OUTER:
for candidate != nil && len(bestFragments) < num {
// see if this overlaps with any of the best already identified
if len(bestFragments) > 0 {
for _, frag := range bestFragments {
if candidate.(*Fragment).Overlaps(frag) {
if len(fq) < 1 {
break OUTER
if len(fq) > 0 {
candidate := heap.Pop(&fq)
OUTER:
for candidate != nil && len(bestFragments) < num {
// see if this overlaps with any of the best already identified
if len(bestFragments) > 0 {
for _, frag := range bestFragments {
if candidate.(*Fragment).Overlaps(frag) {
if len(fq) < 1 {
break OUTER
}
candidate = heap.Pop(&fq)
continue OUTER
}
candidate = heap.Pop(&fq)
continue OUTER
}
bestFragments = append(bestFragments, candidate.(*Fragment))
} else {
bestFragments = append(bestFragments, candidate.(*Fragment))
}
bestFragments = append(bestFragments, candidate.(*Fragment))
} else {
bestFragments = append(bestFragments, candidate.(*Fragment))
}
if len(fq) < 1 {
break
if len(fq) < 1 {
break
}
candidate = heap.Pop(&fq)
}
candidate = heap.Pop(&fq)
}
// now that we have the best fragments, we can format them