From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- includes/api/ApiImport.php | 115 +++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 61 deletions(-) (limited to 'includes/api/ApiImport.php') diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index d33a472a..1b5153f9 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -1,11 +1,10 @@ .@home.nl + * Created on Feb 4, 2009 + * + * Copyright © 2009 Roan Kattouw .@home.nl * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,13 +18,15 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html + * + * @file */ if ( !defined( 'MEDIAWIKI' ) ) { // Eclipse helper - will be ignored in production - require_once ( 'ApiBase.php' ); + require_once( 'ApiBase.php' ); } /** @@ -36,58 +37,54 @@ if ( !defined( 'MEDIAWIKI' ) ) { class ApiImport extends ApiBase { public function __construct( $main, $action ) { - parent :: __construct( $main, $action ); + parent::__construct( $main, $action ); } public function execute() { global $wgUser; - if ( !$wgUser->isAllowed( 'import' ) ) + if ( !$wgUser->isAllowed( 'import' ) ) { $this->dieUsageMsg( array( 'cantimport' ) ); + } $params = $this->extractRequestParams(); - $source = null; $isUpload = false; - if ( isset( $params['interwikisource'] ) ) - { - if ( !isset( $params['interwikipage'] ) ) + if ( isset( $params['interwikisource'] ) ) { + if ( !isset( $params['interwikipage'] ) ) { $this->dieUsageMsg( array( 'missingparam', 'interwikipage' ) ); + } $source = ImportStreamSource::newFromInterwiki( - $params['interwikisource'], - $params['interwikipage'], - $params['fullhistory'], - $params['templates'] ); - } - else - { + $params['interwikisource'], + $params['interwikipage'], + $params['fullhistory'], + $params['templates'] + ); + } else { $isUpload = true; - if ( !$wgUser->isAllowed( 'importupload' ) ) + if ( !$wgUser->isAllowed( 'importupload' ) ) { $this->dieUsageMsg( array( 'cantimport-upload' ) ); + } $source = ImportStreamSource::newFromUpload( 'xml' ); } - if ( $source instanceof WikiErrorMsg ) - $this->dieUsageMsg( array_merge( - array( $source->getMessageKey() ), - $source->getMessageArgs() ) ); - else if ( WikiError::isError( $source ) ) - // This shouldn't happen - $this->dieUsageMsg( array( 'import-unknownerror', $source->getMessage() ) ); - - $importer = new WikiImporter( $source ); - if ( isset( $params['namespace'] ) ) + if ( !$source->isOK() ) { + $this->dieUsageMsg( $source->getErrorsArray() ); + } + + $importer = new WikiImporter( $source->value ); + if ( isset( $params['namespace'] ) ) { $importer->setTargetNamespace( $params['namespace'] ); - $reporter = new ApiImportReporter( $importer, $isUpload, - $params['interwikisource'], - $params['summary'] ); - - $result = $importer->doImport(); - if ( $result instanceof WikiXmlError ) - $this->dieUsageMsg( array( 'import-xml-error', - $result->mLine, - $result->mColumn, - $result->mByte . $result->mContext, - xml_error_string( $result->mXmlError ) ) ); - else if ( WikiError::isError( $result ) ) - $this->dieUsageMsg( array( 'import-unknownerror', $result->getMessage() ) ); // This shouldn't happen + } + $reporter = new ApiImportReporter( + $importer, + $isUpload, + $params['interwikisource'], + $params['summary'] + ); + + try { + $importer->doImport(); + } catch ( MWException $e ) { + $this->dieUsageMsg( array( 'import-unknownerror', $e->getMessage() ) ); + } $resultData = $reporter->getData(); $this->getResult()->setIndexedTagName( $resultData, 'page' ); @@ -104,24 +101,24 @@ class ApiImport extends ApiBase { public function getAllowedParams() { global $wgImportSources; - return array ( + return array( 'token' => null, 'summary' => null, 'xml' => null, 'interwikisource' => array( - ApiBase :: PARAM_TYPE => $wgImportSources + ApiBase::PARAM_TYPE => $wgImportSources ), 'interwikipage' => null, 'fullhistory' => false, 'templates' => false, 'namespace' => array( - ApiBase :: PARAM_TYPE => 'namespace' + ApiBase::PARAM_TYPE => 'namespace' ) ); } public function getParamDescription() { - return array ( + return array( 'token' => 'Import token obtained through prop=info', 'summary' => 'Import summary', 'xml' => 'Uploaded XML file', @@ -134,11 +131,9 @@ class ApiImport extends ApiBase { } public function getDescription() { - return array ( - 'Import a page from another wiki, or an XML file' - ); + return 'Import a page from another wiki, or an XML file'; } - + public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( array( 'cantimport' ), @@ -148,7 +143,7 @@ class ApiImport extends ApiBase { array( 'import-unknownerror', 'result' ), ) ); } - + public function needsToken() { return true; } @@ -160,12 +155,12 @@ class ApiImport extends ApiBase { protected function getExamples() { return array( 'Import [[meta:Help:Parserfunctions]] to namespace 100 with full history:', - ' api.php?action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&namespace=100&fullhistory&token=123ABC', + ' api.php?action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&namespace=100&fullhistory=&token=123ABC', ); } public function getVersion() { - return __CLASS__ . ': $Id: ApiImport.php 74217 2010-10-03 15:53:07Z reedy $'; + return __CLASS__ . ': $Id: ApiImport.php 77800 2010-12-05 14:22:49Z ialex $'; } } @@ -176,8 +171,7 @@ class ApiImport extends ApiBase { class ApiImportReporter extends ImportReporter { private $mResultArr = array(); - function reportPage( $title, $origTitle, $revisionCount, $successCount ) - { + function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) { // Add a result entry $r = array(); ApiQueryBase::addTitleInfo( $r, $title ); @@ -185,11 +179,10 @@ class ApiImportReporter extends ImportReporter { $this->mResultArr[] = $r; // Piggyback on the parent to do the logging - parent::reportPage( $title, $origTitle, $revisionCount, $successCount ); + parent::reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ); } - function getData() - { + function getData() { return $this->mResultArr; } -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf