You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/03/24 06:08:45 UTC

svn commit: r1304705 - in /lucene/dev/branches/branch_3x/solr/core/src: java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java test/org/apache/solr/search/TestExtendedDismaxParser.java

Author: dsmiley
Date: Sat Mar 24 05:08:45 2012
New Revision: 1304705

URL: http://svn.apache.org/viewvc?rev=1304705&view=rev
Log:
SOLR-3270 edismax blank q bug

Modified:
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
    lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java

Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1304705&r1=1304704&r2=1304705&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Sat Mar 24 05:08:45 2012
@@ -158,7 +158,7 @@ class ExtendedDismaxQParser extends QPar
     parsedUserQuery = null;
     String userQuery = getString();
     altUserQuery = null;
-    if( userQuery == null || userQuery.length() < 1 ) {
+    if( userQuery == null || userQuery.trim().length() == 0 ) {
       // If no query is specified, we may have an alternate
       String altQ = solrParams.get( DisMaxParams.ALTQ );
       if (altQ != null) {
@@ -1381,4 +1381,4 @@ final class ExtendedAnalyzer extends Ana
     // TODO: done to fix stop word removal bug - could be done while still using resusable?
     return tokenStream(fieldName, reader);
   }
-}
\ No newline at end of file
+}

Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1304705&r1=1304704&r2=1304705&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Sat Mar 24 05:08:45 2012
@@ -71,8 +71,14 @@ public class TestExtendedDismaxParser ex
     String oner = "*[count(//doc)=1]";
     String twor = "*[count(//doc)=2]";
     String nor = "*[count(//doc)=0]";
-
-  assertQ("expected doc is missing (using un-escaped edismax w/qf)",
+    
+    assertQ("blank q",
+        req("q"," ",
+            "q.alt",allq,
+            "defType","edismax")
+        ,allr);
+    
+    assertQ("expected doc is missing (using un-escaped edismax w/qf)",
           req("q", "literal:colon", 
               "qf", "t_special",
               "defType", "edismax"),