You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/07/24 20:07:01 UTC
svn commit: r679477 - in /lucene/solr/trunk/src:
java/org/apache/solr/handler/component/HighlightComponent.java
test/org/apache/solr/highlight/HighlighterTest.java
Author: ryan
Date: Thu Jul 24 11:07:01 2008
New Revision: 679477
URL: http://svn.apache.org/viewvc?rev=679477&view=rev
Log:
SOLR-652 -- fixing highlighting error when q.alt="*:* and no q is sent
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/component/HighlightComponent.java
lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=679477&r1=679476&r2=679477&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/HighlightComponent.java Thu Jul 24 11:07:01 2008
@@ -17,6 +17,7 @@
package org.apache.solr.handler.component;
+import org.apache.lucene.search.Query;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.HighlightParams;
@@ -62,26 +63,32 @@
defaultHighlightFields = params.getParams(CommonParams.DF);
}
- if(rb.getHighlightQuery()==null) {
+ Query highlightQuery = rb.getHighlightQuery();
+ if(highlightQuery==null) {
if (rb.getQparser() != null) {
try {
- rb.setHighlightQuery( rb.getQparser().getHighlightQuery() );
+ highlightQuery = rb.getQparser().getHighlightQuery();
+ rb.setHighlightQuery( highlightQuery );
} catch (Exception e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
}
} else {
- rb.setHighlightQuery( rb.getQuery() );
+ highlightQuery = rb.getQuery();
+ rb.setHighlightQuery( highlightQuery );
}
}
- NamedList sumData = highlighter.doHighlighting(
- rb.getResults().docList,
- rb.getHighlightQuery().rewrite(req.getSearcher().getReader()),
- req, defaultHighlightFields );
-
- if(sumData != null) {
- // TODO ???? add this directly to the response?
- rb.rsp.add("highlighting", sumData);
+ // No highlighting if there is no query -- consider q.alt="*:*
+ if( highlightQuery != null ) {
+ NamedList sumData = highlighter.doHighlighting(
+ rb.getResults().docList,
+ highlightQuery.rewrite(req.getSearcher().getReader()),
+ req, defaultHighlightFields );
+
+ if(sumData != null) {
+ // TODO ???? add this directly to the response?
+ rb.rsp.add("highlighting", sumData);
+ }
}
}
}
Modified: lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=679477&r1=679476&r2=679477&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/highlight/HighlighterTest.java Thu Jul 24 11:07:01 2008
@@ -148,6 +148,7 @@
args.put("hl", "true");
args.put("hl.fl", "tv_text");
args.put("qf", "tv_text");
+ args.put("q.alt", "*:*");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
"dismax",0,200,args);
@@ -159,7 +160,12 @@
"//lst[@name='highlighting']/lst[@name='1']",
"//lst[@name='1']/arr[@name='tv_text']/str"
);
-
+
+ // try the same thing without a q param
+ assertQ("Should not explode...", // q.alt should return everything
+ sumLRF.makeRequest( new String[] { null } ), // empty query
+ "//result[@numFound='1']"
+ );
}