You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2010/10/10 13:18:34 UTC
svn commit: r1006272 - in /lucene/dev/trunk/solr: CHANGES.txt
src/java/org/apache/solr/search/DisMaxQParser.java
src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
Author: koji
Date: Sun Oct 10 11:18:33 2010
New Revision: 1006272
URL: http://svn.apache.org/viewvc?rev=1006272&view=rev
Log:
SOLR-2148: Highlighter doesn't support q.alt
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParser.java
lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1006272&r1=1006271&r2=1006272&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Oct 10 11:18:33 2010
@@ -514,6 +514,8 @@ Bug Fixes
getLatestAccessedItems(0) or getOldestAccessedItems(0).
(David Smiley via hossman)
+* SOLR-2148: Highlighter doesn't support q.alt. (koji)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1006272&r1=1006271&r2=1006272&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParser.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/DisMaxQParser.java Sun Oct 10 11:18:33 2010
@@ -241,7 +241,7 @@ public class DisMaxQParser extends QPars
@Override
public Query getHighlightQuery() throws ParseException {
- return parsedUserQuery;
+ return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
public void addDebugInfo(NamedList<Object> debugInfo) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1006272&r1=1006271&r2=1006272&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Sun Oct 10 11:18:33 2010
@@ -481,7 +481,7 @@ class ExtendedDismaxQParser extends QPar
@Override
public Query getHighlightQuery() throws ParseException {
- return parsedUserQuery;
+ return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
public void addDebugInfo(NamedList<Object> debugInfo) {