Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1516 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@884417 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2009-11-26 06:47:16 +00:00
parent 768b174f18
commit efcc981ba8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/org/apache/solr/request/BaseResponseWriter.java
View File

@ -59,8 +59,6 @@ public abstract class BaseResponseWriter {
private static final Logger LOG = LoggerFactory
.getLogger(BaseResponseWriter.class);
private static final String RESPONSE_HEADER = "responseHeader";
private static final String SCORE_FIELD = "score";
/**
@ -85,7 +83,7 @@ public abstract class BaseResponseWriter {
for (int i = 0; i < nl.size(); i++) {
String name = nl.getName(i);
Object val = nl.getVal(i);
if (RESPONSE_HEADER.equals(name)) {
if ("responseHeader".equals(name)) {
Boolean omitHeader = request.getParams().getBool(CommonParams.OMIT_HEADER);
if (omitHeader == null || !omitHeader) responseWriter.writeResponseHeader((NamedList) val);
} else if (val instanceof SolrDocumentList) {
@ -153,9 +151,15 @@ public abstract class BaseResponseWriter {
Set<String> returnFields) {
this.schema = schema;
this.searcher = searcher;
this.returnFields = returnFields;
this.includeScore = returnFields != null
&& returnFields.contains("score");
&& returnFields.contains(SCORE_FIELD);
if (returnFields != null) {
if (returnFields.size() == 0 || (returnFields.size() == 1 && includeScore) || returnFields.contains("*")) {
returnFields = null; // null means return all stored fields
}
}
this.returnFields = returnFields;
}
}