$this->addTables( array( 'page', 'categorylinks' ) ); // must be in this order for 'USE INDEX'
$this->addWhereFld( 'cl_to', $categoryTitle->getDBkey() );
- $this->addWhereFld( 'cl_type', $params['type'] );
+ $queryTypes = $params['type'];
+ $contWhere = false;
// Scanning large datasets for rare categories sucks, and I already told
// how to have efficient subcategory access :-) ~~~~ (oh well, domas)
$this->addOption( 'USE INDEX', 'cl_timestamp' );
} else {
if ( $params['continue'] ) {
- // type|from|sortkey
$cont = explode( '|', $params['continue'], 3 );
if ( count( $cont ) != 3 ) {
$this->dieUsage( 'Invalid continue param. You should pass the original value returned '.
'by the previous query', '_badcontinue'
);
}
- $escType = $this->getDB()->addQuotes( $cont[0] );
- $from = intval( $cont[1] );
- $escSortkey = $this->getDB()->addQuotes( $cont[2] );
+
+ // Remove the types to skip from $queryTypes
+ $contTypeIndex = array_search( $cont[0], $queryTypes );
+ $queryTypes = array_slice( $queryTypes, $contTypeIndex );
+
+ // Add a WHERE clause for sortkey and from
+ // pack( "H*", $foo ) is used to convert hex back to binary
+ $escSortkey = $this->getDB()->addQuotes( pack( "H*", $cont[1] ) );
+ $from = intval( $cont[2] );
$op = $dir == 'newer' ? '>' : '<';
- $this->addWhere( "cl_type $op $escType OR " .
- "(cl_type = $escType AND " .
- "(cl_sortkey $op $escSortkey OR " .
+ // $contWhere is used further down
+ $contWhere = "cl_sortkey $op $escSortkey OR " .
"(cl_sortkey = $escSortkey AND " .
- "cl_from $op= $from)))"
- );
-
+ "cl_from $op= $from)";
+ // The below produces ORDER BY cl_sortkey, cl_from, possibly with DESC added to each of them
+ $this->addWhereRange( 'cl_sortkey', $dir, null, null );
+ $this->addWhereRange( 'cl_from', $dir, null, null );
} else {
- // The below produces ORDER BY cl_type, cl_sortkey, cl_from, possibly with DESC added to each of them
- $this->addWhereRange( 'cl_type', $dir, null, null );
+ // The below produces ORDER BY cl_sortkey, cl_from, possibly with DESC added to each of them
$this->addWhereRange( 'cl_sortkey',
$dir,
$params['startsortkey'],
$limit = $params['limit'];
$this->addOption( 'LIMIT', $limit + 1 );
+ if ( $params['sort'] == 'sortkey' ) {
+ // Run a separate SELECT query for each value of cl_type.
+ // This is needed because cl_type is an enum, and MySQL has
+ // inconsistencies between ORDER BY cl_type and
+ // WHERE cl_type >= 'foo' making proper paging impossible
+ // and unindexed.
+ $rows = array();
+ $first = true;
+ foreach ( $queryTypes as $type ) {
+ $extraConds = array( 'cl_type' => $type );
+ if ( $first && $contWhere ) {
+ // Continuation condition. Only added to the
+ // first query, otherwise we'll skip things
+ $extraConds[] = $contWhere;
+ }
+ $res = $this->select( __METHOD__, array( 'where' => $extraConds ) );
+ $rows = array_merge( $rows, iterator_to_array( $res ) );
+ if ( count( $rows ) >= $limit + 1 ) {
+ break;
+ }
+ $first = false;
+ }
+ } else {
+ // Sorting by timestamp
+ // No need to worry about per-type queries because we
+ // aren't sorting or filtering by type anyway
+ $res = $this->select( __METHOD__ );
+ $rows = iterator_to_array( $res );
+ }
+
+ $result = $this->getResult();
$count = 0;
- $res = $this->select( __METHOD__ );
- foreach ( $res as $row ) {
+ foreach ( $rows as $row ) {
if ( ++ $count > $limit ) {
// We've reached the one extra which shows that there are additional pages to be had. Stop here...
// TODO: Security issue - if the user has no right to view next title, it will still be shown
if ( $params['sort'] == 'timestamp' ) {
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->cl_timestamp ) );
} else {
- // Continue format is type|from|sortkey
- // The order is a bit weird but it's convenient to put the sortkey at the end
- // because we don't have to worry about pipes in the sortkey that way
- // (and type and from can't contain pipes anyway)
+ $sortkey = bin2hex( $row->cl_sortkey );
$this->setContinueEnumParameter( 'continue',
- "{$row->cl_type}|{$row->cl_from}|{$row->cl_sortkey}"
+ "{$row->cl_type}|$sortkey|{$row->cl_from}"
);
}
break;
ApiQueryBase::addTitleInfo( $vals, $title );
}
if ( $fld_sortkey ) {
- $vals['sortkey'] = $row->cl_sortkey;
+ $vals['sortkey'] = bin2hex( $row->cl_sortkey );
}
if ( $fld_sortkeyprefix ) {
$vals['sortkeyprefix'] = $row->cl_sortkey_prefix;
if ( $fld_timestamp ) {
$vals['timestamp'] = wfTimestamp( TS_ISO_8601, $row->cl_timestamp );
}
- $fit = $this->getResult()->addValue( array( 'query', $this->getModuleName() ),
+ $fit = $result->addValue( array( 'query', $this->getModuleName() ),
null, $vals );
if ( !$fit ) {
if ( $params['sort'] == 'timestamp' ) {
$this->setContinueEnumParameter( 'start', wfTimestamp( TS_ISO_8601, $row->cl_timestamp ) );
} else {
+ $sortkey = bin2hex( $row->cl_sortkey );
$this->setContinueEnumParameter( 'continue',
- "{$row->cl_type}|{$row->cl_from}|{$row->cl_sortkey}"
+ "{$row->cl_type}|$sortkey|{$row->cl_from}"
);
}
break;
}
if ( is_null( $resultPageSet ) ) {
- $this->getResult()->setIndexedTagName_internal(
+ $result->setIndexedTagName_internal(
array( 'query', $this->getModuleName() ), 'cm' );
}
}
'What pieces of information to include',
' ids - Adds the page ID',
' title - Adds the title and namespace ID of the page',
- ' sortkey - Adds the sortkey used for sorting in the category (may not be human-readble)',
+ ' sortkey - Adds the sortkey used for sorting in the category (hexadecimal string)',
' sortkeyprefix - Adds the sortkey prefix used for sorting in the category (human-readable part of the sortkey)',
' type - Adds the type that the page has been categorised as (page, subcat or file)',
' timestamp - Adds the timestamp of when the page was included',
),
'namespace' => 'Only include pages in these namespaces',
- 'type' => 'What type of category members to include',
+ 'type' => "What type of category members to include. Ignored when {$p}sort=timestamp is set",
'sort' => 'Property to sort by',
'dir' => 'In which direction to sort',
'start' => "Timestamp to start listing from. Can only be used with {$p}sort=timestamp",
'end' => "Timestamp to end listing at. Can only be used with {$p}sort=timestamp",
- 'startsortkey' => "Sortkey to start listing from. Can only be used with {$p}sort=sortkey",
- 'endsortkey' => "Sortkey to end listing at. Can only be used with {$p}sort=sortkey",
+ 'startsortkey' => "Sortkey to start listing from. Must be given in binary format. Can only be used with {$p}sort=sortkey",
+ 'endsortkey' => "Sortkey to end listing at. Must be given in binary format. Can only be used with {$p}sort=sortkey",
'continue' => 'For large categories, give the value retured from previous query',
'limit' => 'The maximum number of pages to return.',
);
);
}
- protected function getExamples() {
+ public function getExamples() {
return array(
'Get first 10 pages in [[Category:Physics]]:',
' api.php?action=query&list=categorymembers&cmtitle=Category:Physics',
);
}
+ public function getHelpUrls() {
+ return 'http://www.mediawiki.org/wiki/API:Categorymembers';
+ }
+
public function getVersion() {
return __CLASS__ . ': $Id$';
}
dépôts / lhc / web / wiklou.git / blobdiff