honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't return null highlighted fields if no highlighting was done

This commit is contained in:
kimchy 2011-02-11 18:31:09 +02:00
parent d054c8c14e
commit 65197ba39d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/elasticsearch/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
View File

@ -35,7 +35,6 @@ import org.elasticsearch.common.io.FastStringReader;
import org.elasticsearch.common.lucene.document.SingleFieldSelector; import org.elasticsearch.common.lucene.document.SingleFieldSelector;
import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.search.SearchException;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.fetch.FetchPhaseExecutionException; import org.elasticsearch.search.fetch.FetchPhaseExecutionException;
import org.elasticsearch.search.fetch.SearchHitPhase; import org.elasticsearch.search.fetch.SearchHitPhase;
@ -148,7 +147,7 @@ public class HighlightPhase implements SearchHitPhase {
for (int i = 0; i < fragments.length; i++) { for (int i = 0; i < fragments.length; i++) {
fragments[i] = fragsList.get(i).toString(); fragments[i] = fragsList.get(i).toString();
} }
if (fragments.length>0){ if (fragments.length > 0) {
HighlightField highlightField = new HighlightField(field.field(), fragments); HighlightField highlightField = new HighlightField(field.field(), fragments);
highlightFields.put(highlightField.name(), highlightField); highlightFields.put(highlightField.name(), highlightField);
} }
@ -164,7 +163,7 @@ public class HighlightPhase implements SearchHitPhase {
} catch (IOException e) { } catch (IOException e) {
throw new FetchPhaseExecutionException(context, "Failed to highlight field [" + field.field() + "]", e); throw new FetchPhaseExecutionException(context, "Failed to highlight field [" + field.field() + "]", e);
} }
if (fragments.length>0){ if (fragments != null && fragments.length > 0) {
HighlightField highlightField = new HighlightField(field.field(), fragments); HighlightField highlightField = new HighlightField(field.field(), fragments);
highlightFields.put(highlightField.name(), highlightField); highlightFields.put(highlightField.name(), highlightField);
} }