* API: (bug 15995) Added cmstartsortkey and cmendsortkey parameters to list=categorym...

* Drop useless and possibly filesorting ORDER BY cl_to from list=categorymembers
* Handle ORDER BY cl_sortkey, cl_from (possibly with DESC appended to each of them) with addWhereRange() calls

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c294dcc..2f8d0f0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -339,6 +339,8 @@ The following extensions are migrated into MediaWiki 1.14:
   and patrolmarks right
 * (bug 15985) acfrom and aifrom parameters didn't work when sorting in
   descending order.
+* (bug 15995) Add cmstartsortkey and cmendsortkey parameters to
+  list=categorymembers
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index 91f822a..ad5836c 100644 (file)
--- a/includes/api/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -76,17 +76,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
                $this->addTables(array('page','categorylinks'));        // must be in this order for 'USE INDEX'
                                                                        // Not needed after bug 10280 is applied to servers
                if($params['sort'] == 'timestamp')
-               {
                        $this->addOption('USE INDEX', 'cl_timestamp');
-                       // cl_timestamp will be added by addWhereRange() later
-                       $this->addOption('ORDER BY', 'cl_to');
-               }
                else
-               {
-                       $dir = ($params['dir'] == 'desc' ? ' DESC' : '');
                        $this->addOption('USE INDEX', 'cl_sortkey');
-                       $this->addOption('ORDER BY', 'cl_to, cl_sortkey' . $dir . ', cl_from' . $dir);
-               }
 
                $this->addWhere('cl_from=page_id');
                $this->setContinuation($params['continue'], $params['dir']);
@@ -94,6 +86,11 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
                $this->addWhereFld('page_namespace', $params['namespace']);
                if($params['sort'] == 'timestamp')
                        $this->addWhereRange('cl_timestamp', ($params['dir'] == 'asc' ? 'newer' : 'older'), $params['start'], $params['end']);
+               else
+               {
+                       $this->addWhereRange('cl_sortkey', ($params['dir'] == 'asc' ? 'newer' : 'older'), $params['startsortkey'], $params['endsortkey']);
+                       $this->addWhereRange('cl_from', ($params['dir'] == 'asc' ? 'newer' : 'older'), null, null);
+               }
 
                $limit = $params['limit'];
                $this->addOption('LIMIT', $limit +1);
@@ -225,7 +222,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
                        ),
                        'end' => array(
                                ApiBase :: PARAM_TYPE => 'timestamp'
-                       )
+                       ),
+                       'startsortkey' => null,
+                       'endsortkey' => null,
                );
        }
 
@@ -238,6 +237,8 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
                        'dir' => 'In which direction to sort',
                        'start' => 'Timestamp to start listing from. Can only be used with cmsort=timestamp',
                        'end' => 'Timestamp to end listing at. Can only be used with cmsort=timestamp',
+                       'startsortkey' => 'Sortkey to start listing from. Can only be used with cmsort=sortkey',
+                       'endsortkey' => 'Sortkey to end listing at. Can only be used with cmsort=sortkey',
                        'continue' => 'For large categories, give the value retured from previous query',
                        'limit' => 'The maximum number of pages to return.',
                );