From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Feb 2009 13:37:51 +0100 Subject: updated to MediaWiki 1.14.0 --- includes/api/ApiQueryRevisions.php | 90 ++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 33 deletions(-) (limited to 'includes/api/ApiQueryRevisions.php') diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 1fd2d7c6..977e792b 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -58,7 +58,7 @@ class ApiQueryRevisions extends ApiQueryBase { return array(); $this->tokenFunctions = array( - 'rollback' => array( 'ApiQueryRevisions','getRollbackToken' ) + 'rollback' => array( 'ApiQueryRevisions', 'getRollbackToken' ) ); wfRunHooks('APIQueryRevisionsTokens', array(&$this->tokenFunctions)); return $this->tokenFunctions; @@ -74,14 +74,16 @@ class ApiQueryRevisions extends ApiQueryBase { } public function execute() { - $limit = $startid = $endid = $start = $end = $dir = $prop = $user = $excludeuser = $expandtemplates = $section = $token = null; - extract($this->extractRequestParams(false)); + $params = $this->extractRequestParams(false); // If any of those parameters are used, work in 'enumeration' mode. // Enum mode can only be used when exactly one page is provided. // Enumerating revisions on multiple pages make it extremely // difficult to manage continuations and require additional SQL indexes - $enumRevMode = (!is_null($user) || !is_null($excludeuser) || !is_null($limit) || !is_null($startid) || !is_null($endid) || $dir === 'newer' || !is_null($start) || !is_null($end)); + $enumRevMode = (!is_null($params['user']) || !is_null($params['excludeuser']) || + !is_null($params['limit']) || !is_null($params['startid']) || + !is_null($params['endid']) || $params['dir'] === 'newer' || + !is_null($params['start']) || !is_null($params['end'])); $pageSet = $this->getPageSet(); @@ -100,8 +102,10 @@ class ApiQueryRevisions extends ApiQueryBase { $this->addTables('revision'); $this->addFields( Revision::selectFields() ); + $this->addTables( 'page' ); + $this->addWhere('page_id = rev_page'); - $prop = array_flip($prop); + $prop = array_flip($params['prop']); // Optional fields $this->fld_ids = isset ($prop['ids']); @@ -111,11 +115,9 @@ class ApiQueryRevisions extends ApiQueryBase { $this->fld_comment = isset ($prop['comment']); $this->fld_size = isset ($prop['size']); $this->fld_user = isset ($prop['user']); - $this->token = $token; + $this->token = $params['token']; - if ( !is_null($this->token) || ( $this->fld_content && $this->expandTemplates ) || $pageCount > 0) { - $this->addTables( 'page' ); - $this->addWhere('page_id=rev_page'); + if ( !is_null($this->token) || $pageCount > 0) { $this->addFields( Revision::selectPageFields() ); } @@ -136,15 +138,17 @@ class ApiQueryRevisions extends ApiQueryBase { $this->fld_content = true; - $this->expandTemplates = $expandtemplates; - if(isset($section)) - $this->section = $section; + $this->expandTemplates = $params['expandtemplates']; + $this->generateXML = $params['generatexml']; + if(isset($params['section'])) + $this->section = $params['section']; else $this->section = false; } $userMax = ( $this->fld_content ? ApiBase::LIMIT_SML1 : ApiBase::LIMIT_BIG1 ); $botMax = ( $this->fld_content ? ApiBase::LIMIT_SML2 : ApiBase::LIMIT_BIG2 ); + $limit = $params['limit']; if( $limit == 'max' ) { $limit = $this->getMain()->canApiHighLimits() ? $botMax : $userMax; $this->getResult()->addValue( 'limits', $this->getModuleName(), $limit ); @@ -153,13 +157,13 @@ class ApiQueryRevisions extends ApiQueryBase { if ($enumRevMode) { // This is mostly to prevent parameter errors (and optimize SQL?) - if (!is_null($startid) && !is_null($start)) + if (!is_null($params['startid']) && !is_null($params['start'])) $this->dieUsage('start and startid cannot be used together', 'badparams'); - if (!is_null($endid) && !is_null($end)) + if (!is_null($params['endid']) && !is_null($params['end'])) $this->dieUsage('end and endid cannot be used together', 'badparams'); - if(!is_null($user) && !is_null( $excludeuser)) + if(!is_null($params['user']) && !is_null($params['excludeuser'])) $this->dieUsage('user and excludeuser cannot be used together', 'badparams'); // This code makes an assumption that sorting by rev_id and rev_timestamp produces @@ -169,10 +173,12 @@ class ApiQueryRevisions extends ApiQueryBase { // one row with the same timestamp for the same page. // The order needs to be the same as start parameter to avoid SQL filesort. - if (is_null($startid) && is_null($endid)) - $this->addWhereRange('rev_timestamp', $dir, $start, $end); + if (is_null($params['startid']) && is_null($params['endid'])) + $this->addWhereRange('rev_timestamp', $params['dir'], + $params['start'], $params['end']); else - $this->addWhereRange('rev_id', $dir, $startid, $endid); + $this->addWhereRange('rev_id', $params['dir'], + $params['startid'], $params['endid']); // must manually initialize unset limit if (is_null($limit)) @@ -182,30 +188,38 @@ class ApiQueryRevisions extends ApiQueryBase { // There is only one ID, use it $this->addWhereFld('rev_page', current(array_keys($pageSet->getGoodTitles()))); - if(!is_null($user)) { - $this->addWhereFld('rev_user_text', $user); - } elseif (!is_null( $excludeuser)) { - $this->addWhere('rev_user_text != ' . $this->getDB()->addQuotes($excludeuser)); + if(!is_null($params['user'])) { + $this->addWhereFld('rev_user_text', $params['user']); + } elseif (!is_null( $params['excludeuser'])) { + $this->addWhere('rev_user_text != ' . + $this->getDB()->addQuotes($params['excludeuser'])); } } elseif ($revCount > 0) { - $this->validateLimit('rev_count', $revCount, 1, $userMax, $botMax); + $max = $this->getMain()->canApiHighLimits() ? $botMax : $userMax; + $revs = $pageSet->getRevisionIDs(); + if(self::truncateArray($revs, $max)) + $this->setWarning("Too many values supplied for parameter 'revids': the limit is $max"); // Get all revision IDs - $this->addWhereFld('rev_id', array_keys($pageSet->getRevisionIDs())); + $this->addWhereFld('rev_id', array_keys($revs)); // assumption testing -- we should never get more then $revCount rows. $limit = $revCount; } elseif ($pageCount > 0) { + $max = $this->getMain()->canApiHighLimits() ? $botMax : $userMax; + $titles = $pageSet->getGoodTitles(); + if(self::truncateArray($titles, $max)) + $this->setWarning("Too many values supplied for parameter 'titles': the limit is $max"); + // When working in multi-page non-enumeration mode, // limit to the latest revision only $this->addWhere('page_id=rev_page'); $this->addWhere('page_latest=rev_id'); - $this->validateLimit('page_count', $pageCount, 1, $userMax, $botMax); - + // Get all page IDs - $this->addWhereFld('page_id', array_keys($pageSet->getGoodTitles())); + $this->addWhereFld('page_id', array_keys($titles)); // assumption testing -- we should never get more then $pageCount rows. $limit = $pageCount; @@ -281,7 +295,7 @@ class ApiQueryRevisions extends ApiQueryBase { if ($this->fld_comment) { $comment = $revision->getComment(); - if (!empty($comment)) + if (strval($comment) !== '') $vals['comment'] = $comment; } @@ -312,6 +326,17 @@ class ApiQueryRevisions extends ApiQueryBase { if($text === false) $this->dieUsage("There is no section {$this->section} in r".$revision->getId(), 'nosuchsection'); } + if ($this->generateXML) { + $wgParser->startExternalParse( $title, new ParserOptions(), OT_PREPROCESS ); + $dom = $wgParser->preprocessToDom( $text ); + if ( is_callable( array( $dom, 'saveXML' ) ) ) { + $xml = $dom->saveXML(); + } else { + $xml = $dom->__toString(); + } + $vals['parsetree'] = $xml; + + } if ($this->expandTemplates) { $text = $wgParser->preprocess( $text, $title, new ParserOptions() ); } @@ -366,11 +391,9 @@ class ApiQueryRevisions extends ApiQueryBase { 'excludeuser' => array( ApiBase :: PARAM_TYPE => 'user' ), - 'expandtemplates' => false, - 'section' => array( - ApiBase :: PARAM_TYPE => 'integer' - ), + 'generatexml' => false, + 'section' => null, 'token' => array( ApiBase :: PARAM_TYPE => array_keys($this->getTokenFunctions()), ApiBase :: PARAM_ISMULTI => true @@ -390,6 +413,7 @@ class ApiQueryRevisions extends ApiQueryBase { 'user' => 'only include revisions made by user', 'excludeuser' => 'exclude revisions made by user', 'expandtemplates' => 'expand templates in revision content', + 'generatexml' => 'generate XML parse tree for revision content', 'section' => 'only retrieve the content of this section', 'token' => 'Which tokens to obtain for each revision', ); @@ -424,6 +448,6 @@ class ApiQueryRevisions extends ApiQueryBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiQueryRevisions.php 37300 2008-07-08 08:42:27Z btongminh $'; + return __CLASS__ . ': $Id: ApiQueryRevisions.php 44719 2008-12-17 16:34:01Z catrope $'; } } -- cgit v1.2.3-54-g00ecf