From 20acda586628ff16bd27b8e06c425b832fd26567 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Fri, 2 Jul 2010 22:07:13 +0000 Subject: [PATCH] Removed trailing spaces --- includes/ImportXMLReader.php | 206 +++++++++++++++++------------------ 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/includes/ImportXMLReader.php b/includes/ImportXMLReader.php index ebfb12a90b..36de45a23c 100644 --- a/includes/ImportXMLReader.php +++ b/includes/ImportXMLReader.php @@ -14,11 +14,11 @@ class WikiImporter { */ function __construct( $source ) { $this->reader = new XMLReader2(); - + stream_wrapper_register( 'uploadsource', 'UploadSourceAdapter' ); $id = UploadSourceAdapter::registerSource( $source ); $this->reader->open( "uploadsource://$id" ); - + // Default callbacks $this->setRevisionCallback( array( $this, "importRevision" ) ); $this->setUploadCallback( array( $this, 'importUpload' ) ); @@ -32,11 +32,11 @@ class WikiImporter { } private function debug( $data ) { - if( $this->mDebug ) { + if( $this->mDebug ) { wfDebug( "IMPORT: $data\n" ); - } + } } - + private function warn( $data ) { wfDebug( "IMPORT: $data\n" ); } @@ -50,7 +50,7 @@ class WikiImporter { $wgOut->addHTML( "
  • " . htmlspecialchars( $data ) . "
    • \n" ); } } - + /** * Set debug mode... */ @@ -105,7 +105,7 @@ class WikiImporter { $this->mUploadCallback = $callback; return $previous; } - + /** * Sets the action to perform as each log item reached. * @param $callback callback @@ -116,7 +116,7 @@ class WikiImporter { $this->mLogItemCallback = $callback; return $previous; } - + /** * Sets the action to perform when site info is encountered * @param $callback callback @@ -142,7 +142,7 @@ class WikiImporter { return false; } } - + /** * Default per-revision callback, performs the import. * @param $revision WikiRevision @@ -151,7 +151,7 @@ class WikiImporter { $dbw = wfGetDB( DB_MASTER ); return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) ); } - + /** * Default per-revision callback, performs the import. * @param $rev WikiRevision @@ -169,7 +169,7 @@ class WikiImporter { //return $dbw->deadlockLoop( array( $revision, 'importUpload' ) ); return false; } - + /** * Mostly for hook use */ @@ -194,7 +194,7 @@ class WikiImporter { $this->debug( "-- Comment: " . $revision->comment ); $this->debug( "-- Text: " . $revision->text ); } - + /** * Notify the callback function when a new is reached. * @param $title Title @@ -218,7 +218,7 @@ class WikiImporter { call_user_func_array( $this->mPageOutCallback, $args ); } } - + /** * Notify the callback function of a revision * @param $revision A WikiRevision object @@ -231,7 +231,7 @@ class WikiImporter { return false; } } - + /** * Notify the callback function of a new log item * @param $revision A WikiRevision object @@ -244,7 +244,7 @@ class WikiImporter { return false; } } - + /** * Shouldn't something like this be built-in to XMLReader? * Fetches text contents of the current element, assuming @@ -257,7 +257,7 @@ class WikiImporter { } # -------------- - + /** Left in for debugging */ private function dumpElement() { static $lookup = null; @@ -265,7 +265,7 @@ class WikiImporter { $xmlReaderConstants = array( "NONE", "ELEMENT", - "ATTRIBUTE", + "ATTRIBUTE", "TEXT", "CDATA", "ENTITY_REF", @@ -283,13 +283,13 @@ class WikiImporter { "XML_DECLARATION", ); $lookup = array(); - + foreach( $xmlReaderConstants as $name ) { $lookup[constant("XmlReader::$name")] = $name; } } - - print( var_dump( + + print( var_dump( $lookup[$this->reader->nodeType], $this->reader->name, $this->reader->value @@ -299,23 +299,23 @@ class WikiImporter { /** * Primary entry point */ - public function doImport() { + public function doImport() { $this->reader->read(); - + if ( $this->reader->name != 'mediawiki' ) { throw new MWException( "Expected tag, got ". $this->reader->name ); } $this->debug( " tag is correct." ); - + $this->debug( "Starting primary dump processing loop." ); - + $keepReading = $this->reader->read(); $skip = false; while ( $keepReading ) { $tag = $this->reader->name; $type = $this->reader->nodeType; - + if ( !wfRunHooks( 'ImportHandleToplevelXMLTag', $this->reader ) ) { // Do nothing } elseif ( $tag == 'mediawiki' && $type == XmlReader::END_ELEMENT ) { @@ -324,14 +324,14 @@ class WikiImporter { $this->handleSiteInfo(); } elseif ( $tag == 'page' ) { $this->handlePage(); - } elseif ( $tag == 'logitem' ) { - $this->handleLogItem(); + } elseif ( $tag == 'logitem' ) { + $this->handleLogItem(); } elseif ( $tag != '#text' ) { $this->warn( "Unhandled top-level XML tag $tag" ); - + $skip = true; } - + if ($skip) { $keepReading = $this->reader->next(); $skip = false; @@ -343,7 +343,7 @@ class WikiImporter { return true; } - + private function handleSiteInfo() { // Site info is useful, but not actually used for dump imports. // Includes a quick short-circuit to save performance. @@ -353,23 +353,23 @@ class WikiImporter { } throw new MWException( "SiteInfo tag is not yet handled, do not set mSiteInfoCallback" ); } - + private function handleLogItem() { $this->debug( "Enter log item handler." ); $logInfo = array(); - + // Fields that can just be stuffed in the pageInfo object $normalFields = array( 'id', 'comment', 'type', 'action', 'timestamp', 'logtitle', 'params' ); - + while ( $this->reader->read() ) { if ( $this->reader->nodeType == XmlReader::END_ELEMENT && $this->reader->name == 'logitem') { break; } - + $tag = $this->reader->name; - + if ( !wfRunHooks( 'ImportHandleLogItemXMLTag', $this->reader, $logInfo ) ) { // Do nothing @@ -381,53 +381,53 @@ class WikiImporter { $this->warn( "Unhandled log-item XML tag $tag" ); } } - + $this->processLogItem( $logInfo ); } - + private function processLogItem( $logInfo ) { $revision = new WikiRevision; - + $revision->setID( $logInfo['id'] ); $revision->setType( $logInfo['type'] ); $revision->setAction( $logInfo['action'] ); $revision->setTimestamp( $logInfo['timestamp'] ); $revision->setParams( $logInfo['params'] ); $revision->setTitle( Title::newFromText( $logInfo['logtitle'] ) ); - + if ( isset( $logInfo['comment'] ) ) { $revision->setComment( $logInfo['comment'] ); } - + if ( isset( $logInfo['contributor']['ip'] ) ) { $revision->setUserIP( $logInfo['contributor']['ip'] ); } if ( isset( $logInfo['contributor']['username'] ) ) { $revision->setUserName( $logInfo['contributor']['username'] ); } - + return $this->logItemCallback( $revision ); } - + private function handlePage() { // Handle page data. $this->debug( "Enter page handler." ); $pageInfo = array( 'revisionCount' => 0, 'successfulRevisionCount' => 0 ); - + // Fields that can just be stuffed in the pageInfo object $normalFields = array( 'title', 'id', 'redirect', 'restrictions' ); - + $skip = false; $badTitle = false; - + while ( $skip ? $this->reader->next() : $this->reader->read() ) { if ( $this->reader->nodeType == XmlReader::END_ELEMENT && $this->reader->name == 'page') { break; } - + $tag = $this->reader->name; - + if ( $badTitle ) { // The title is invalid, bail out of this page $skip = true; @@ -438,12 +438,12 @@ class WikiImporter { $pageInfo[$tag] = $this->nodeContents(); if ( $tag == 'title' ) { $title = $this->processTitle( $pageInfo['title'] ); - + if ( !$title ) { $badTitle = true; $skip = true; } - + $this->pageCallback( $title ); list( $pageInfo['_title'], $origTitle ) = $title; } @@ -456,29 +456,29 @@ class WikiImporter { $skip = true; } } - + $this->pageOutCallback( $pageInfo['_title'], $origTitle, $pageInfo['revisionCount'], $pageInfo['successfulRevisionCount'], $pageInfo ); } - + private function handleRevision( &$pageInfo ) { $this->debug( "Enter revision handler" ); $revisionInfo = array(); - + $normalFields = array( 'id', 'timestamp', 'comment', 'minor', 'text' ); - + $skip = false; - + while ( $skip ? $this->reader->next() : $this->reader->read() ) { if ( $this->reader->nodeType == XmlReader::END_ELEMENT && $this->reader->name == 'revision') { break; } - + $tag = $this->reader->name; - + if ( !wfRunHooks( 'ImportHandleRevisionXMLTag', $this->reader, $pageInfo, $revisionInfo ) ) { // Do nothing @@ -491,55 +491,55 @@ class WikiImporter { $skip = true; } } - + $pageInfo['revisionCount']++; if ( $this->processRevision( $pageInfo, $revisionInfo ) ) { $pageInfo['successfulRevisionCount']++; } } - + private function processRevision( $pageInfo, $revisionInfo ) { $revision = new WikiRevision; - + $revision->setID( $revisionInfo['id'] ); $revision->setText( $revisionInfo['text'] ); $revision->setTitle( $pageInfo['_title'] ); $revision->setTimestamp( $revisionInfo['timestamp'] ); - + if ( isset( $revisionInfo['comment'] ) ) { $revision->setComment( $revisionInfo['comment'] ); } - + if ( isset( $revisionInfo['minor'] ) ) $revision->setMinor( true ); - + if ( isset( $revisionInfo['contributor']['ip'] ) ) { $revision->setUserIP( $revisionInfo['contributor']['ip'] ); } if ( isset( $revisionInfo['contributor']['username'] ) ) { $revision->setUserName( $revisionInfo['contributor']['username'] ); } - + return $this->revisionCallback( $revision ); } - + private function handleUpload( &$pageInfo ) { $this->debug( "Enter upload handler" ); $uploadInfo = array(); - + $normalFields = array( 'timestamp', 'comment', 'filename', 'text', 'src', 'size' ); - + $skip = false; - + while ( $skip ? $this->reader->next() : $this->reader->read() ) { if ( $this->reader->nodeType == XmlReader::END_ELEMENT && $this->reader->name == 'upload') { break; } - + $tag = $this->reader->name; - + if ( !wfRunHooks( 'ImportHandleUploadXMLTag', $this->reader, $pageInfo, $revisionInfo ) ) { // Do nothing @@ -552,13 +552,13 @@ class WikiImporter { $skip = true; } } - + return $this->processUpload( $pageInfo, $uploadInfo ); } - + private function processUpload( $pageInfo, $uploadInfo ) { $revision = new WikiRevision; - + $revision->setTitle( $pageInfo['_title'] ); $revision->setID( $uploadInfo['id'] ); $revision->setTimestamp( $uploadInfo['timestamp'] ); @@ -567,49 +567,49 @@ class WikiImporter { $revision->setSrc( $uploadInfo['src'] ); $revision->setSize( intval( $uploadInfo['size'] ) ); $revision->setComment( $uploadInfo['comment'] ); - + if ( isset( $uploadInfo['contributor']['ip'] ) ) { $revision->setUserIP( $revisionInfo['contributor']['ip'] ); } if ( isset( $uploadInfo['contributor']['username'] ) ) { $revision->setUserName( $revisionInfo['contributor']['username'] ); } - + return $this->uploadCallback( $revision ); } - + private function handleContributor() { $fields = array( 'id', 'ip', 'username' ); $info = array(); - + while ( $this->reader->read() ) { if ( $this->reader->nodeType == XmlReader::END_ELEMENT && $this->reader->name == 'contributor') { break; } - + $tag = $this->reader->name; - + if ( in_array( $tag, $fields ) ) { $info[$tag] = $this->nodeContents(); } } - + return $info; } - + private function processTitle( $text ) { $workTitle = $text; $origTitle = Title::newFromText( $workTitle ); $title = null; - + if( !is_null( $this->mTargetNamespace ) && !is_null( $origTitle ) ) { $title = Title::makeTitle( $this->mTargetNamespace, $origTitle->getDBkey() ); } else { $title = Title::newFromText( $workTitle ); } - + if( is_null( $title ) ) { // Invalid page title? Ignore the page $this->notice( "Skipping invalid page title '$workTitle'" ); @@ -617,7 +617,7 @@ class WikiImporter { $this->notice( "Skipping interwiki page title '$workTitle'" ); $title = null; } - + return array( $origTitle, $title ); } } @@ -625,61 +625,61 @@ class WikiImporter { /** This is a horrible hack used to keep source compatibility */ class UploadSourceAdapter { static $sourceRegistrations = array(); - + private $mSource; private $mBuffer; private $mPosition; - + static function registerSource( $source ) { $id = wfGenerateToken(); - + self::$sourceRegistrations[$id] = $source; - + return $id; } - + function stream_open( $path, $mode, $options, &$opened_path ) { $url = parse_url($path); $id = $url['host']; - + if ( !isset( self::$sourceRegistrations[$id] ) ) { return false; } - + $this->mSource = self::$sourceRegistrations[$id]; - + return true; } - + function stream_read( $count ) { $return = ''; $leave = false; - + while ( !$leave && !$this->mSource->atEnd() && strlen($this->mBuffer) < $count ) { $read = $this->mSource->readChunk(); - + if ( !strlen($read) ) { - $leave = true; + $leave = true; } - + $this->mBuffer .= $read; } - + if ( strlen($this->mBuffer) ) { $return = substr( $this->mBuffer, 0, $count ); $this->mBuffer = substr( $this->mBuffer, $count ); } - + $this->mPosition += strlen($return); - + return $return; } - + function stream_write( $data ) { return false; } - + function stream_tell() { return $this->mPosition; } @@ -690,7 +690,7 @@ class UploadSourceAdapter { function url_stat() { $result = array(); - + $result['dev'] = $result[0] = 0; $result['ino'] = $result[1] = 0; $result['mode'] = $result[2] = 0; @@ -704,7 +704,7 @@ class UploadSourceAdapter { $result['ctime'] = $result[10] = 0; $result['blksize'] = $result[11] = 0; $result['blocks'] = $result[12] = 0; - + return $result; } } -- 2.20.1