svn commit: r1034890 - /lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java

[yo...@apache.org]

Author: yonik
Date: Sat Nov 13 21:45:58 2010
New Revision: 1034890

URL: http://svn.apache.org/viewvc?rev=1034890&view=rev
Log:
SOLR-236: default group.sort to sort

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1034890&r1=1034889&r2=1034890&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryComponent.java Sat Nov 13 21:45:58 2010
@@ -307,8 +307,8 @@ public class QueryComponent extends Sear
         String[] queries = params.getParams(GroupParams.GROUP_QUERY);
         String groupSortStr = params.get(GroupParams.GROUP_SORT);
 
-        // TODO: don't use groupSort==null to test for the presense of a sort since "score desc" will normalize to null
-        Sort groupSort = groupSortStr != null ? QueryParsing.parseSort(groupSortStr, req) : null;
+        // groupSort defaults to sort
+        Sort groupSort = groupSortStr == null ? cmd.getSort() : QueryParsing.parseSort(groupSortStr, req);
 
         int limitDefault = cmd.getLen(); // this is normally from "rows"
         int groupOffsetDefault = params.getInt(GroupParams.GROUP_OFFSET, 0);