lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r1006273 - in /lucene/dev/branches/branch_3x/solr: CHANGES.txt src/java/org/apache/solr/search/DisMaxQParser.java
Date Sun, 10 Oct 2010 11:19:05 GMT
Author: koji
Date: Sun Oct 10 11:19:05 2010
New Revision: 1006273

URL: http://svn.apache.org/viewvc?rev=1006273&view=rev
Log:
SOLR-2148: Highlighter doesn't support q.alt

Modified:
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1006273&r1=1006272&r2=1006273&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Sun Oct 10 11:19:05 2010
@@ -427,6 +427,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/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1006273&r1=1006272&r2=1006273&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java
(original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java
Sun Oct 10 11:19:05 2010
@@ -224,7 +224,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) {



Mime
View raw message