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 2007/11/07 14:21:04 UTC
svn commit: r592740 - in /lucene/solr/trunk/src/java/org/apache/solr/search:
LuceneQParserPlugin.java QParser.java
Author: ryan
Date: Wed Nov 7 05:21:03 2007
New Revision: 592740
URL: http://svn.apache.org/viewvc?rev=592740&view=rev
Log:
SOLR-334? The new query parser does not handle 'null' when sort is "score desc"
http://www.nabble.com/Sorting-problem-tf4762114.html
Modified:
lucene/solr/trunk/src/java/org/apache/solr/search/LuceneQParserPlugin.java
lucene/solr/trunk/src/java/org/apache/solr/search/QParser.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=592740&r1=592739&r2=592740&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/LuceneQParserPlugin.java Wed Nov 7 05:21:03 2007
@@ -124,7 +124,9 @@
QueryParsing.SortSpec sort = super.getSort(useGlobal);
if (sortStr != null && sortStr.length()>0 && sort.getSort()==null) {
QueryParsing.SortSpec oldSort = QueryParsing.parseSort(sortStr, getReq().getSchema());
- sort.sort = oldSort.sort;
+ if( oldSort != null ) {
+ sort.sort = oldSort.sort;
+ }
}
return sort;
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QParser.java?rev=592740&r1=592739&r2=592740&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/QParser.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/QParser.java Wed Nov 7 05:21:03 2007
@@ -152,15 +152,19 @@
int start = startS != null ? Integer.parseInt(startS) : 0;
int rows = rowsS != null ? Integer.parseInt(rowsS) : 10;
- QueryParsing.SortSpec sort;
+ QueryParsing.SortSpec sort = null;
if (sortStr != null) {
+ // may return null if 'score desc'
sort = QueryParsing.parseSort(sortStr, req.getSchema());
+ }
+
+ if( sort == null ) {
+ sort = new QueryParsing.SortSpec(null, start, rows);
+ }
+ else {
sort.offset = start;
sort.num = rows;
- } else {
- sort = new QueryParsing.SortSpec(null, start, rows);
}
-
return sort;
}