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/Import.php | 1749 +++++++++++++++++++++++++++------------------------ 1 file changed, 923 insertions(+), 826 deletions(-) (limited to 'includes/Import.php') diff --git a/includes/Import.php b/includes/Import.php index 45908a66..c76a6834 100644 --- a/includes/Import.php +++ b/includes/Import.php @@ -1,7 +1,8 @@ + * + * Copyright © 2003,2005 Brion Vibber * http://www.mediawiki.org/ * * This program is free software; you can redistribute it and/or modify @@ -24,1000 +25,1096 @@ */ /** + * XML file reader for the page data importer * + * implements Special:Import * @ingroup SpecialPage */ -class WikiRevision { - var $title = null; - var $id = 0; - var $timestamp = "20010115000000"; - var $user = 0; - var $user_text = ""; - var $text = ""; - var $comment = ""; - var $minor = false; - var $type = ""; - var $action = ""; - var $params = ""; +class WikiImporter { + private $reader = null; + private $mLogItemCallback, $mUploadCallback, $mRevisionCallback, $mPageCallback; + private $mSiteInfoCallback, $mTargetNamespace, $mPageOutCallback; + private $mDebug; - function setTitle( $title ) { - if( is_object( $title ) ) { - $this->title = $title; - } elseif( is_null( $title ) ) { - throw new MWException( "WikiRevision given a null title in import. You may need to adjust \$wgLegalTitleChars." ); - } else { - throw new MWException( "WikiRevision given non-object title in import." ); - } - } + /** + * Creates an ImportXMLReader drawing from the source provided + */ + function __construct( $source ) { + $this->reader = new XMLReader(); - function setID( $id ) { - $this->id = $id; - } + stream_wrapper_register( 'uploadsource', 'UploadSourceAdapter' ); + $id = UploadSourceAdapter::registerSource( $source ); + $this->reader->open( "uploadsource://$id" ); - function setTimestamp( $ts ) { - # 2003-08-05T18:30:02Z - $this->timestamp = wfTimestamp( TS_MW, $ts ); + // Default callbacks + $this->setRevisionCallback( array( $this, "importRevision" ) ); + $this->setUploadCallback( array( $this, 'importUpload' ) ); + $this->setLogItemCallback( array( $this, 'importLogItem' ) ); + $this->setPageOutCallback( array( $this, 'finishImportPage' ) ); } - function setUsername( $user ) { - $this->user_text = $user; + private function throwXmlError( $err ) { + $this->debug( "FAILURE: $err" ); + wfDebug( "WikiImporter XML error: $err\n" ); } - function setUserIP( $ip ) { - $this->user_text = $ip; + private function debug( $data ) { + if( $this->mDebug ) { + wfDebug( "IMPORT: $data\n" ); + } } - function setText( $text ) { - $this->text = $text; + private function warn( $data ) { + wfDebug( "IMPORT: $data\n" ); } - function setComment( $text ) { - $this->comment = $text; + private function notice( $data ) { + global $wgCommandLineMode; + if( $wgCommandLineMode ) { + print "$data\n"; + } else { + global $wgOut; + $wgOut->addHTML( "
  • " . htmlspecialchars( $data ) . "
    • \n" ); + } } - function setMinor( $minor ) { - $this->minor = (bool)$minor; + /** + * Set debug mode... + */ + function setDebug( $debug ) { + $this->mDebug = $debug; } - function setSrc( $src ) { - $this->src = $src; + /** + * Sets the action to perform as each new page in the stream is reached. + * @param $callback callback + * @return callback + */ + public function setPageCallback( $callback ) { + $previous = $this->mPageCallback; + $this->mPageCallback = $callback; + return $previous; } - function setFilename( $filename ) { - $this->filename = $filename; + /** + * Sets the action to perform as each page in the stream is completed. + * Callback accepts the page title (as a Title object), a second object + * with the original title form (in case it's been overridden into a + * local namespace), and a count of revisions. + * + * @param $callback callback + * @return callback + */ + public function setPageOutCallback( $callback ) { + $previous = $this->mPageOutCallback; + $this->mPageOutCallback = $callback; + return $previous; } - function setSize( $size ) { - $this->size = intval( $size ); - } - - function setType( $type ) { - $this->type = $type; - } - - function setAction( $action ) { - $this->action = $action; + /** + * Sets the action to perform as each page revision is reached. + * @param $callback callback + * @return callback + */ + public function setRevisionCallback( $callback ) { + $previous = $this->mRevisionCallback; + $this->mRevisionCallback = $callback; + return $previous; } - - function setParams( $params ) { - $this->params = $params; + + /** + * Sets the action to perform as each file upload version is reached. + * @param $callback callback + * @return callback + */ + public function setUploadCallback( $callback ) { + $previous = $this->mUploadCallback; + $this->mUploadCallback = $callback; + return $previous; } - function getTitle() { - return $this->title; + /** + * Sets the action to perform as each log item reached. + * @param $callback callback + * @return callback + */ + public function setLogItemCallback( $callback ) { + $previous = $this->mLogItemCallback; + $this->mLogItemCallback = $callback; + return $previous; } - function getID() { - return $this->id; + /** + * Sets the action to perform when site info is encountered + * @param $callback callback + * @return callback + */ + public function setSiteInfoCallback( $callback ) { + $previous = $this->mSiteInfoCallback; + $this->mSiteInfoCallback = $callback; + return $previous; } - function getTimestamp() { - return $this->timestamp; + /** + * Set a target namespace to override the defaults + */ + public function setTargetNamespace( $namespace ) { + if( is_null( $namespace ) ) { + // Don't override namespaces + $this->mTargetNamespace = null; + } elseif( $namespace >= 0 ) { + // FIXME: Check for validity + $this->mTargetNamespace = intval( $namespace ); + } else { + return false; + } } - function getUser() { - return $this->user_text; + /** + * Default per-revision callback, performs the import. + * @param $revision WikiRevision + */ + public function importRevision( $revision ) { + $dbw = wfGetDB( DB_MASTER ); + return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) ); } - function getText() { - return $this->text; + /** + * Default per-revision callback, performs the import. + * @param $rev WikiRevision + */ + public function importLogItem( $rev ) { + $dbw = wfGetDB( DB_MASTER ); + return $dbw->deadlockLoop( array( $rev, 'importLogItem' ) ); } - function getComment() { - return $this->comment; + /** + * Dummy for now... + */ + public function importUpload( $revision ) { + //$dbw = wfGetDB( DB_MASTER ); + //return $dbw->deadlockLoop( array( $revision, 'importUpload' ) ); + return false; } - function getMinor() { - return $this->minor; + /** + * Mostly for hook use + */ + public function finishImportPage( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) { + $args = func_get_args(); + return wfRunHooks( 'AfterImportPage', $args ); } - function getSrc() { - return $this->src; + /** + * Alternate per-revision callback, for debugging. + * @param $revision WikiRevision + */ + public function debugRevisionHandler( &$revision ) { + $this->debug( "Got revision:" ); + if( is_object( $revision->title ) ) { + $this->debug( "-- Title: " . $revision->title->getPrefixedText() ); + } else { + $this->debug( "-- Title: " ); + } + $this->debug( "-- User: " . $revision->user_text ); + $this->debug( "-- Timestamp: " . $revision->timestamp ); + $this->debug( "-- Comment: " . $revision->comment ); + $this->debug( "-- Text: " . $revision->text ); } - function getFilename() { - return $this->filename; + /** + * Notify the callback function when a new is reached. + * @param $title Title + */ + function pageCallback( $title ) { + if( isset( $this->mPageCallback ) ) { + call_user_func( $this->mPageCallback, $title ); + } } - function getSize() { - return $this->size; + /** + * Notify the callback function when a is closed. + * @param $title Title + * @param $origTitle Title + * @param $revCount Integer + * @param $sucCount Int: number of revisions for which callback returned true + * @param $pageInfo Array: associative array of page information + */ + private function pageOutCallback( $title, $origTitle, $revCount, $sucCount, $pageInfo ) { + if( isset( $this->mPageOutCallback ) ) { + $args = func_get_args(); + call_user_func_array( $this->mPageOutCallback, $args ); + } } - - function getType() { - return $this->type; + + /** + * Notify the callback function of a revision + * @param $revision A WikiRevision object + */ + private function revisionCallback( $revision ) { + if ( isset( $this->mRevisionCallback ) ) { + return call_user_func_array( $this->mRevisionCallback, + array( $revision, $this ) ); + } else { + return false; + } } - - function getAction() { - return $this->action; + + /** + * Notify the callback function of a new log item + * @param $revision A WikiRevision object + */ + private function logItemCallback( $revision ) { + if ( isset( $this->mLogItemCallback ) ) { + return call_user_func_array( $this->mLogItemCallback, + array( $revision, $this ) ); + } else { + return false; + } } - - function getParams() { - return $this->params; + + /** + * Shouldn't something like this be built-in to XMLReader? + * Fetches text contents of the current element, assuming + * no sub-elements or such scary things. + * @return string + * @access private + */ + private function nodeContents() { + if( $this->reader->isEmptyElement ) { + return ""; + } + $buffer = ""; + while( $this->reader->read() ) { + switch( $this->reader->nodeType ) { + case XmlReader::TEXT: + case XmlReader::SIGNIFICANT_WHITESPACE: + $buffer .= $this->reader->value; + break; + case XmlReader::END_ELEMENT: + return $buffer; + } + } + + $this->reader->close(); + return ''; } - function importOldRevision() { - $dbw = wfGetDB( DB_MASTER ); + # -------------- - # Sneak a single revision into place - $user = User::newFromName( $this->getUser() ); - if( $user ) { - $userId = intval( $user->getId() ); - $userText = $user->getName(); - } else { - $userId = 0; - $userText = $this->getUser(); + /** Left in for debugging */ + private function dumpElement() { + static $lookup = null; + if (!$lookup) { + $xmlReaderConstants = array( + "NONE", + "ELEMENT", + "ATTRIBUTE", + "TEXT", + "CDATA", + "ENTITY_REF", + "ENTITY", + "PI", + "COMMENT", + "DOC", + "DOC_TYPE", + "DOC_FRAGMENT", + "NOTATION", + "WHITESPACE", + "SIGNIFICANT_WHITESPACE", + "END_ELEMENT", + "END_ENTITY", + "XML_DECLARATION", + ); + $lookup = array(); + + foreach( $xmlReaderConstants as $name ) { + $lookup[constant("XmlReader::$name")] = $name; + } } - // avoid memory leak...? - $linkCache = LinkCache::singleton(); - $linkCache->clear(); + print( var_dump( + $lookup[$this->reader->nodeType], + $this->reader->name, + $this->reader->value + )."\n\n" ); + } - $article = new Article( $this->title ); - $pageId = $article->getId(); - if( $pageId == 0 ) { - # must create the page... - $pageId = $article->insertOn( $dbw ); - $created = true; - } else { - $created = false; + /** + * Primary entry point + */ + public function doImport() { + $this->reader->read(); - $prior = $dbw->selectField( 'revision', '1', - array( 'rev_page' => $pageId, - 'rev_timestamp' => $dbw->timestamp( $this->timestamp ), - 'rev_user_text' => $userText, - 'rev_comment' => $this->getComment() ), - __METHOD__ - ); - if( $prior ) { - // FIXME: this could fail slightly for multiple matches :P - wfDebug( __METHOD__ . ": skipping existing revision for [[" . - $this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" ); - return false; + 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 ) ) { + // Do nothing + } elseif ( $tag == 'mediawiki' && $type == XmlReader::END_ELEMENT ) { + break; + } elseif ( $tag == 'siteinfo' ) { + $this->handleSiteInfo(); + } elseif ( $tag == 'page' ) { + $this->handlePage(); + } 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; + $this->debug( "Skip" ); + } else { + $keepReading = $this->reader->read(); } } - # FIXME: Use original rev_id optionally (better for backups) - # Insert the row - $revision = new Revision( array( - 'page' => $pageId, - 'text' => $this->getText(), - 'comment' => $this->getComment(), - 'user' => $userId, - 'user_text' => $userText, - 'timestamp' => $this->timestamp, - 'minor_edit' => $this->minor, - ) ); - $revId = $revision->insertOn( $dbw ); - $changed = $article->updateIfNewerOn( $dbw, $revision ); - - # To be on the safe side... - $tempTitle = $GLOBALS['wgTitle']; - $GLOBALS['wgTitle'] = $this->title; + return true; + } - if( $created ) { - wfDebug( __METHOD__ . ": running onArticleCreate\n" ); - Article::onArticleCreate( $this->title ); + private function handleSiteInfo() { + // Site info is useful, but not actually used for dump imports. + // Includes a quick short-circuit to save performance. + if ( ! $this->mSiteInfoCallback ) { + $this->reader->next(); + return true; + } + throw new MWException( "SiteInfo tag is not yet handled, do not set mSiteInfoCallback" ); + } - wfDebug( __METHOD__ . ": running create updates\n" ); - $article->createUpdates( $revision ); + private function handleLogItem() { + $this->debug( "Enter log item handler." ); + $logInfo = array(); - } elseif( $changed ) { - wfDebug( __METHOD__ . ": running onArticleEdit\n" ); - Article::onArticleEdit( $this->title ); + // Fields that can just be stuffed in the pageInfo object + $normalFields = array( 'id', 'comment', 'type', 'action', 'timestamp', + 'logtitle', 'params' ); - wfDebug( __METHOD__ . ": running edit updates\n" ); - $article->editUpdates( - $this->getText(), - $this->getComment(), - $this->minor, - $this->timestamp, - $revId ); + while ( $this->reader->read() ) { + if ( $this->reader->nodeType == XmlReader::END_ELEMENT && + $this->reader->name == 'logitem') { + break; + } + + $tag = $this->reader->name; + + if ( !wfRunHooks( 'ImportHandleLogItemXMLTag', + $this, $logInfo ) ) { + // Do nothing + } elseif ( in_array( $tag, $normalFields ) ) { + $logInfo[$tag] = $this->nodeContents(); + } elseif ( $tag == 'contributor' ) { + $logInfo['contributor'] = $this->handleContributor(); + } elseif ( $tag != '#text' ) { + $this->warn( "Unhandled log-item XML tag $tag" ); + } } - $GLOBALS['wgTitle'] = $tempTitle; - return true; + $this->processLogItem( $logInfo ); } - - function importLogItem() { - $dbw = wfGetDB( DB_MASTER ); - # FIXME: this will not record autoblocks - if( !$this->getTitle() ) { - wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " . - $this->timestamp . "\n" ); - return; + + 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'] ); } - # Check if it exists already - // FIXME: use original log ID (better for backups) - $prior = $dbw->selectField( 'logging', '1', - array( 'log_type' => $this->getType(), - 'log_action' => $this->getAction(), - 'log_timestamp' => $dbw->timestamp( $this->timestamp ), - 'log_namespace' => $this->getTitle()->getNamespace(), - 'log_title' => $this->getTitle()->getDBkey(), - 'log_comment' => $this->getComment(), - #'log_user_text' => $this->user_text, - 'log_params' => $this->params ), - __METHOD__ - ); - // FIXME: this could fail slightly for multiple matches :P - if( $prior ) { - wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " . - $this->timestamp . "\n" ); - return false; + + if ( isset( $logInfo['contributor']['ip'] ) ) { + $revision->setUserIP( $logInfo['contributor']['ip'] ); } - $log_id = $dbw->nextSequenceValue( 'logging_log_id_seq' ); - $data = array( - 'log_id' => $log_id, - 'log_type' => $this->type, - 'log_action' => $this->action, - 'log_timestamp' => $dbw->timestamp( $this->timestamp ), - 'log_user' => User::idFromName( $this->user_text ), - #'log_user_text' => $this->user_text, - 'log_namespace' => $this->getTitle()->getNamespace(), - 'log_title' => $this->getTitle()->getDBkey(), - 'log_comment' => $this->getComment(), - 'log_params' => $this->params - ); - $dbw->insert( 'logging', $data, __METHOD__ ); + if ( isset( $logInfo['contributor']['username'] ) ) { + $revision->setUserName( $logInfo['contributor']['username'] ); + } + + return $this->logItemCallback( $revision ); } - function importUpload() { - wfDebug( __METHOD__ . ": STUB\n" ); + private function handlePage() { + // Handle page data. + $this->debug( "Enter page handler." ); + $pageInfo = array( 'revisionCount' => 0, 'successfulRevisionCount' => 0 ); - /** - // from file revert... - $source = $this->file->getArchiveVirtualUrl( $this->oldimage ); - $comment = $wgRequest->getText( 'wpComment' ); - // TODO: Preserve file properties from database instead of reloading from file - $status = $this->file->upload( $source, $comment, $comment ); - if( $status->isGood() ) { - */ + // Fields that can just be stuffed in the pageInfo object + $normalFields = array( 'title', 'id', 'redirect', 'restrictions' ); - /** - // from file upload... - $this->mLocalFile = wfLocalFile( $nt ); - $this->mDestName = $this->mLocalFile->getName(); - //.... - $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, - File::DELETE_SOURCE, $this->mFileProps ); - if ( !$status->isGood() ) { - $resultDetails = array( 'internal' => $status->getWikiText() ); - */ + $skip = false; + $badTitle = false; - // @todo Fixme: upload() uses $wgUser, which is wrong here - // it may also create a page without our desire, also wrong potentially. - // and, it will record a *current* upload, but we might want an archive version here + while ( $skip ? $this->reader->next() : $this->reader->read() ) { + if ( $this->reader->nodeType == XmlReader::END_ELEMENT && + $this->reader->name == 'page') { + break; + } - $file = wfLocalFile( $this->getTitle() ); - if( !$file ) { - var_dump( $file ); - wfDebug( "IMPORT: Bad file. :(\n" ); - return false; + $tag = $this->reader->name; + + if ( $badTitle ) { + // The title is invalid, bail out of this page + $skip = true; + } elseif ( !wfRunHooks( 'ImportHandlePageXMLTag', array( $this, + &$pageInfo ) ) ) { + // Do nothing + } elseif ( in_array( $tag, $normalFields ) ) { + $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; + } + } elseif ( $tag == 'revision' ) { + $this->handleRevision( $pageInfo ); + } elseif ( $tag == 'upload' ) { + $this->handleUpload( $pageInfo ); + } elseif ( $tag != '#text' ) { + $this->warn( "Unhandled page XML tag $tag" ); + $skip = true; + } } - $source = $this->downloadSource(); - if( !$source ) { - wfDebug( "IMPORT: Could not fetch remote file. :(\n" ); - return false; - } + $this->pageOutCallback( $pageInfo['_title'], $origTitle, + $pageInfo['revisionCount'], + $pageInfo['successfulRevisionCount'], + $pageInfo ); + } - $status = $file->upload( $source, - $this->getComment(), - $this->getComment(), // Initial page, if none present... - File::DELETE_SOURCE, - false, // props... - $this->getTimestamp() ); + private function handleRevision( &$pageInfo ) { + $this->debug( "Enter revision handler" ); + $revisionInfo = array(); - if( $status->isGood() ) { - // yay? - wfDebug( "IMPORT: is ok?\n" ); - return true; - } + $normalFields = array( 'id', 'timestamp', 'comment', 'minor', 'text' ); - wfDebug( "IMPORT: is bad? " . $status->getXml() . "\n" ); - return false; + $skip = false; - } + while ( $skip ? $this->reader->next() : $this->reader->read() ) { + if ( $this->reader->nodeType == XmlReader::END_ELEMENT && + $this->reader->name == 'revision') { + break; + } - function downloadSource() { - global $wgEnableUploads; - if( !$wgEnableUploads ) { - return false; + $tag = $this->reader->name; + + if ( !wfRunHooks( 'ImportHandleRevisionXMLTag', $this, + $pageInfo, $revisionInfo ) ) { + // Do nothing + } elseif ( in_array( $tag, $normalFields ) ) { + $revisionInfo[$tag] = $this->nodeContents(); + } elseif ( $tag == 'contributor' ) { + $revisionInfo['contributor'] = $this->handleContributor(); + } elseif ( $tag != '#text' ) { + $this->warn( "Unhandled revision XML tag $tag" ); + $skip = true; + } } - $tempo = tempnam( wfTempDir(), 'download' ); - $f = fopen( $tempo, 'wb' ); - if( !$f ) { - wfDebug( "IMPORT: couldn't write to temp file $tempo\n" ); - return false; + $pageInfo['revisionCount']++; + if ( $this->processRevision( $pageInfo, $revisionInfo ) ) { + $pageInfo['successfulRevisionCount']++; } + } - // @todo Fixme! - $src = $this->getSrc(); - $data = Http::get( $src ); - if( !$data ) { - wfDebug( "IMPORT: couldn't fetch source $src\n" ); - fclose( $f ); - unlink( $tempo ); - return false; + 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'] ); } - fwrite( $f, $data ); - fclose( $f ); + if ( isset( $revisionInfo['minor'] ) ) + $revision->setMinor( true ); - return $tempo; + 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(); -/** - * implements Special:Import - * @ingroup SpecialPage - */ -class WikiImporter { - var $mDebug = false; - var $mSource = null; - var $mPageCallback = null; - var $mPageOutCallback = null; - var $mRevisionCallback = null; - var $mLogItemCallback = null; - var $mUploadCallback = null; - var $mTargetNamespace = null; - var $mXmlNamespace = false; - var $lastfield; - var $tagStack = array(); + $normalFields = array( 'timestamp', 'comment', 'filename', 'text', + 'src', 'size' ); - function __construct( $source ) { - $this->setRevisionCallback( array( $this, "importRevision" ) ); - $this->setUploadCallback( array( $this, "importUpload" ) ); - $this->setLogItemCallback( array( $this, "importLogItem" ) ); - $this->mSource = $source; + $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, + $pageInfo ) ) { + // Do nothing + } elseif ( in_array( $tag, $normalFields ) ) { + $uploadInfo[$tag] = $this->nodeContents(); + } elseif ( $tag == 'contributor' ) { + $uploadInfo['contributor'] = $this->handleContributor(); + } elseif ( $tag != '#text' ) { + $this->warn( "Unhandled upload XML tag $tag" ); + $skip = true; + } + } + + return $this->processUpload( $pageInfo, $uploadInfo ); } - function throwXmlError( $err ) { - $this->debug( "FAILURE: $err" ); - wfDebug( "WikiImporter XML error: $err\n" ); + private function processUpload( $pageInfo, $uploadInfo ) { + $revision = new WikiRevision; + + $revision->setTitle( $pageInfo['_title'] ); + $revision->setID( $uploadInfo['id'] ); + $revision->setTimestamp( $uploadInfo['timestamp'] ); + $revision->setText( $uploadInfo['text'] ); + $revision->setFilename( $uploadInfo['filename'] ); + $revision->setSrc( $uploadInfo['src'] ); + $revision->setSize( intval( $uploadInfo['size'] ) ); + $revision->setComment( $uploadInfo['comment'] ); + + if ( isset( $uploadInfo['contributor']['ip'] ) ) { + $revision->setUserIP( $uploadInfo['contributor']['ip'] ); + } + if ( isset( $uploadInfo['contributor']['username'] ) ) { + $revision->setUserName( $uploadInfo['contributor']['username'] ); + } + + return $this->uploadCallback( $revision ); } - function handleXmlNamespace ( $parser, $data, $prefix=false, $uri=false ) { - if( preg_match( '/www.mediawiki.org/',$prefix ) ) { - $prefix = str_replace( '/','\/',$prefix ); - $this->mXmlNamespace='/^'.$prefix.':/'; - } + 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; } - function stripXmlNamespace($name) { - if( $this->mXmlNamespace ) { - return(preg_replace($this->mXmlNamespace,'',$name,1)); + private function processTitle( $text ) { + $workTitle = $text; + $origTitle = Title::newFromText( $workTitle ); + + if( !is_null( $this->mTargetNamespace ) && !is_null( $origTitle ) ) { + $title = Title::makeTitle( $this->mTargetNamespace, + $origTitle->getDBkey() ); + } else { + $title = Title::newFromText( $workTitle ); } - else { - return($name); + + if( is_null( $title ) ) { + // Invalid page title? Ignore the page + $this->notice( "Skipping invalid page title '$workTitle'" ); + return false; + } elseif( $title->getInterwiki() != '' ) { + $this->notice( "Skipping interwiki page title '$workTitle'" ); + return false; } + + return array( $title, $origTitle ); } +} - # -------------- +/** This is a horrible hack used to keep source compatibility */ +class UploadSourceAdapter { + static $sourceRegistrations = array(); - function doImport() { - if( empty( $this->mSource ) ) { - return new WikiErrorMsg( "importnotext" ); - } + private $mSource; + private $mBuffer; + private $mPosition; - $parser = xml_parser_create_ns( "UTF-8" ); + static function registerSource( $source ) { + $id = wfGenerateToken(); - # case folding violates XML standard, turn it off - xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false ); + self::$sourceRegistrations[$id] = $source; - xml_set_object( $parser, $this ); - xml_set_element_handler( $parser, "in_start", "" ); - xml_set_start_namespace_decl_handler( $parser, "handleXmlNamespace" ); + return $id; + } - $offset = 0; // for context extraction on error reporting - do { - $chunk = $this->mSource->readChunk(); - if( !xml_parse( $parser, $chunk, $this->mSource->atEnd() ) ) { - wfDebug( "WikiImporter::doImport encountered XML parsing error\n" ); - return new WikiXmlError( $parser, wfMsgHtml( 'import-parse-failure' ), $chunk, $offset ); - } - $offset += strlen( $chunk ); - } while( $chunk !== false && !$this->mSource->atEnd() ); - xml_parser_free( $parser ); + 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 debug( $data ) { - if( $this->mDebug ) { - wfDebug( "IMPORT: $data\n" ); + 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; + } + + $this->mBuffer .= $read; } - } - function notice( $data ) { - global $wgCommandLineMode; - if( $wgCommandLineMode ) { - print "$data\n"; - } else { - global $wgOut; - $wgOut->addHTML( "
  • " . htmlspecialchars( $data ) . "
    • \n" ); + if ( strlen($this->mBuffer) ) { + $return = substr( $this->mBuffer, 0, $count ); + $this->mBuffer = substr( $this->mBuffer, $count ); } - } - /** - * Set debug mode... - */ - function setDebug( $debug ) { - $this->mDebug = $debug; - } + $this->mPosition += strlen($return); - /** - * Sets the action to perform as each new page in the stream is reached. - * @param $callback callback - * @return callback - */ - function setPageCallback( $callback ) { - $previous = $this->mPageCallback; - $this->mPageCallback = $callback; - return $previous; + return $return; } - /** - * Sets the action to perform as each page in the stream is completed. - * Callback accepts the page title (as a Title object), a second object - * with the original title form (in case it's been overridden into a - * local namespace), and a count of revisions. - * - * @param $callback callback - * @return callback - */ - function setPageOutCallback( $callback ) { - $previous = $this->mPageOutCallback; - $this->mPageOutCallback = $callback; - return $previous; + function stream_write( $data ) { + return false; } - /** - * Sets the action to perform as each page revision is reached. - * @param $callback callback - * @return callback - */ - function setRevisionCallback( $callback ) { - $previous = $this->mRevisionCallback; - $this->mRevisionCallback = $callback; - return $previous; + function stream_tell() { + return $this->mPosition; } - /** - * Sets the action to perform as each file upload version is reached. - * @param $callback callback - * @return callback - */ - function setUploadCallback( $callback ) { - $previous = $this->mUploadCallback; - $this->mUploadCallback = $callback; - return $previous; + function stream_eof() { + return $this->mSource->atEnd(); } - - /** - * Sets the action to perform as each log item reached. - * @param $callback callback - * @return callback - */ - function setLogItemCallback( $callback ) { - $previous = $this->mLogItemCallback; - $this->mLogItemCallback = $callback; - return $previous; + + function url_stat() { + $result = array(); + + $result['dev'] = $result[0] = 0; + $result['ino'] = $result[1] = 0; + $result['mode'] = $result[2] = 0; + $result['nlink'] = $result[3] = 0; + $result['uid'] = $result[4] = 0; + $result['gid'] = $result[5] = 0; + $result['rdev'] = $result[6] = 0; + $result['size'] = $result[7] = 0; + $result['atime'] = $result[8] = 0; + $result['mtime'] = $result[9] = 0; + $result['ctime'] = $result[10] = 0; + $result['blksize'] = $result[11] = 0; + $result['blocks'] = $result[12] = 0; + + return $result; } +} - /** - * Set a target namespace to override the defaults - */ - function setTargetNamespace( $namespace ) { - if( is_null( $namespace ) ) { - // Don't override namespaces - $this->mTargetNamespace = null; - } elseif( $namespace >= 0 ) { - // FIXME: Check for validity - $this->mTargetNamespace = intval( $namespace ); +class XMLReader2 extends XMLReader { + function nodeContents() { + if( $this->isEmptyElement ) { + return ""; + } + $buffer = ""; + while( $this->read() ) { + switch( $this->nodeType ) { + case XmlReader::TEXT: + case XmlReader::SIGNIFICANT_WHITESPACE: + $buffer .= $this->value; + break; + case XmlReader::END_ELEMENT: + return $buffer; + } + } + return $this->close(); + } +} + +/** + * @todo document (e.g. one-sentence class description). + * @ingroup SpecialPage + */ +class WikiRevision { + var $title = null; + var $id = 0; + var $timestamp = "20010115000000"; + var $user = 0; + var $user_text = ""; + var $text = ""; + var $comment = ""; + var $minor = false; + var $type = ""; + var $action = ""; + var $params = ""; + + function setTitle( $title ) { + if( is_object( $title ) ) { + $this->title = $title; + } elseif( is_null( $title ) ) { + throw new MWException( "WikiRevision given a null title in import. You may need to adjust \$wgLegalTitleChars." ); } else { - return false; + throw new MWException( "WikiRevision given non-object title in import." ); } } - /** - * Default per-revision callback, performs the import. - * @param $revision WikiRevision - * @private - */ - function importRevision( $revision ) { - $dbw = wfGetDB( DB_MASTER ); - return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) ); + function setID( $id ) { + $this->id = $id; } - - /** - * Default per-revision callback, performs the import. - * @param $rev WikiRevision - * @private - */ - function importLogItem( $rev ) { - $dbw = wfGetDB( DB_MASTER ); - return $dbw->deadlockLoop( array( $rev, 'importLogItem' ) ); + + function setTimestamp( $ts ) { + # 2003-08-05T18:30:02Z + $this->timestamp = wfTimestamp( TS_MW, $ts ); } - /** - * Dummy for now... - */ - function importUpload( $revision ) { - //$dbw = wfGetDB( DB_MASTER ); - //return $dbw->deadlockLoop( array( $revision, 'importUpload' ) ); - return false; + function setUsername( $user ) { + $this->user_text = $user; } - /** - * Alternate per-revision callback, for debugging. - * @param $revision WikiRevision - * @private - */ - function debugRevisionHandler( &$revision ) { - $this->debug( "Got revision:" ); - if( is_object( $revision->title ) ) { - $this->debug( "-- Title: " . $revision->title->getPrefixedText() ); - } else { - $this->debug( "-- Title: " ); - } - $this->debug( "-- User: " . $revision->user_text ); - $this->debug( "-- Timestamp: " . $revision->timestamp ); - $this->debug( "-- Comment: " . $revision->comment ); - $this->debug( "-- Text: " . $revision->text ); + function setUserIP( $ip ) { + $this->user_text = $ip; } - /** - * Notify the callback function when a new is reached. - * @param $title Title - * @private - */ - function pageCallback( $title ) { - if( is_callable( $this->mPageCallback ) ) { - call_user_func( $this->mPageCallback, $title ); - } + function setText( $text ) { + $this->text = $text; } - /** - * Notify the callback function when a is closed. - * @param $title Title - * @param $origTitle Title - * @param $revisionCount int - * @param $successCount Int: number of revisions for which callback returned true - * @private - */ - function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) { - if( is_callable( $this->mPageOutCallback ) ) { - call_user_func( $this->mPageOutCallback, $title, $origTitle, - $revisionCount, $successCount ); - } + function setComment( $text ) { + $this->comment = $text; } - # XML parser callbacks from here out -- beware! - function donothing( $parser, $x, $y="" ) { - #$this->debug( "donothing" ); + function setMinor( $minor ) { + $this->minor = (bool)$minor; } - function in_start( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_start $name" ); - if( $name != "mediawiki" ) { - return $this->throwXMLerror( "Expected , got <$name>" ); - } - xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" ); - } - - function in_mediawiki( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_mediawiki $name" ); - if( $name == 'siteinfo' ) { - xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" ); - } elseif( $name == 'page' ) { - $this->push( $name ); - $this->workRevisionCount = 0; - $this->workSuccessCount = 0; - $this->uploadCount = 0; - $this->uploadSuccessCount = 0; - xml_set_element_handler( $parser, "in_page", "out_page" ); - } elseif( $name == 'logitem' ) { - $this->push( $name ); - $this->workRevision = new WikiRevision; - xml_set_element_handler( $parser, "in_logitem", "out_logitem" ); - } else { - return $this->throwXMLerror( "Expected , got <$name>" ); - } + function setSrc( $src ) { + $this->src = $src; } - function out_mediawiki( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_mediawiki $name" ); - if( $name != "mediawiki" ) { - return $this->throwXMLerror( "Expected , got " ); - } - xml_set_element_handler( $parser, "donothing", "donothing" ); - } - - - function in_siteinfo( $parser, $name, $attribs ) { - // no-ops for now - $name = $this->stripXmlNamespace($name); - $this->debug( "in_siteinfo $name" ); - switch( $name ) { - case "sitename": - case "base": - case "generator": - case "case": - case "namespaces": - case "namespace": - break; - default: - return $this->throwXMLerror( "Element <$name> not allowed in ." ); - } + + function setFilename( $filename ) { + $this->filename = $filename; } - function out_siteinfo( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - if( $name == "siteinfo" ) { - xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" ); - } + function setSize( $size ) { + $this->size = intval( $size ); + } + + function setType( $type ) { + $this->type = $type; + } + + function setAction( $action ) { + $this->action = $action; + } + + function setParams( $params ) { + $this->params = $params; } + function getTitle() { + return $this->title; + } - function in_page( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_page $name" ); - switch( $name ) { - case "id": - case "title": - case "redirect": - case "restrictions": - $this->appendfield = $name; - $this->appenddata = ""; - xml_set_element_handler( $parser, "in_nothing", "out_append" ); - xml_set_character_data_handler( $parser, "char_append" ); - break; - case "revision": - $this->push( "revision" ); - if( is_object( $this->pageTitle ) ) { - $this->workRevision = new WikiRevision; - $this->workRevision->setTitle( $this->pageTitle ); - $this->workRevisionCount++; - } else { - // Skipping items due to invalid page title - $this->workRevision = null; - } - xml_set_element_handler( $parser, "in_revision", "out_revision" ); - break; - case "upload": - $this->push( "upload" ); - if( is_object( $this->pageTitle ) ) { - $this->workRevision = new WikiRevision; - $this->workRevision->setTitle( $this->pageTitle ); - $this->uploadCount++; - } else { - // Skipping items due to invalid page title - $this->workRevision = null; - } - xml_set_element_handler( $parser, "in_upload", "out_upload" ); - break; - default: - return $this->throwXMLerror( "Element <$name> not allowed in a ." ); - } + function getID() { + return $this->id; } - function out_page( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_page $name" ); - $this->pop(); - if( $name != "page" ) { - return $this->throwXMLerror( "Expected , got " ); - } - xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" ); + function getTimestamp() { + return $this->timestamp; + } - $this->pageOutCallback( $this->pageTitle, $this->origTitle, - $this->workRevisionCount, $this->workSuccessCount ); + function getUser() { + return $this->user_text; + } - $this->workTitle = null; - $this->workRevision = null; - $this->workRevisionCount = 0; - $this->workSuccessCount = 0; - $this->pageTitle = null; - $this->origTitle = null; + function getText() { + return $this->text; } - function in_nothing( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_nothing $name" ); - return $this->throwXMLerror( "No child elements allowed here; got <$name>" ); + function getComment() { + return $this->comment; } - function char_append( $parser, $data ) { - $this->debug( "char_append '$data'" ); - $this->appenddata .= $data; + function getMinor() { + return $this->minor; } - function out_append( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_append $name" ); - if( $name != $this->appendfield ) { - return $this->throwXMLerror( "Expected appendfield}>, got " ); - } + function getSrc() { + return $this->src; + } - switch( $this->appendfield ) { - case "title": - $this->workTitle = $this->appenddata; - $this->origTitle = Title::newFromText( $this->workTitle ); - if( !is_null( $this->mTargetNamespace ) && !is_null( $this->origTitle ) ) { - $this->pageTitle = Title::makeTitle( $this->mTargetNamespace, - $this->origTitle->getDBkey() ); - } else { - $this->pageTitle = Title::newFromText( $this->workTitle ); - } - if( is_null( $this->pageTitle ) ) { - // Invalid page title? Ignore the page - $this->notice( "Skipping invalid page title '$this->workTitle'" ); - } elseif( $this->pageTitle->getInterwiki() != '' ) { - $this->notice( "Skipping interwiki page title '$this->workTitle'" ); - $this->pageTitle = null; - } else { - $this->pageCallback( $this->workTitle ); - } - break; - case "id": - if ( $this->parentTag() == 'revision' || $this->parentTag() == 'logitem' ) { - if( $this->workRevision ) - $this->workRevision->setID( $this->appenddata ); - } - break; - case "text": - if( $this->workRevision ) - $this->workRevision->setText( $this->appenddata ); - break; - case "username": - if( $this->workRevision ) - $this->workRevision->setUsername( $this->appenddata ); - break; - case "ip": - if( $this->workRevision ) - $this->workRevision->setUserIP( $this->appenddata ); - break; - case "timestamp": - if( $this->workRevision ) - $this->workRevision->setTimestamp( $this->appenddata ); - break; - case "comment": - if( $this->workRevision ) - $this->workRevision->setComment( $this->appenddata ); - break; - case "type": - if( $this->workRevision ) - $this->workRevision->setType( $this->appenddata ); - break; - case "action": - if( $this->workRevision ) - $this->workRevision->setAction( $this->appenddata ); - break; - case "logtitle": - if( $this->workRevision ) - $this->workRevision->setTitle( Title::newFromText( $this->appenddata ) ); - break; - case "params": - if( $this->workRevision ) - $this->workRevision->setParams( $this->appenddata ); - break; - case "minor": - if( $this->workRevision ) - $this->workRevision->setMinor( true ); - break; - case "filename": - if( $this->workRevision ) - $this->workRevision->setFilename( $this->appenddata ); - break; - case "src": - if( $this->workRevision ) - $this->workRevision->setSrc( $this->appenddata ); - break; - case "size": - if( $this->workRevision ) - $this->workRevision->setSize( intval( $this->appenddata ) ); - break; - default: - $this->debug( "Bad append: {$this->appendfield}" ); - } - $this->appendfield = ""; - $this->appenddata = ""; - - $parent = $this->parentTag(); - xml_set_element_handler( $parser, "in_$parent", "out_$parent" ); - xml_set_character_data_handler( $parser, "donothing" ); - } - - function in_revision( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_revision $name" ); - switch( $name ) { - case "id": - case "timestamp": - case "comment": - case "minor": - case "text": - $this->appendfield = $name; - xml_set_element_handler( $parser, "in_nothing", "out_append" ); - xml_set_character_data_handler( $parser, "char_append" ); - break; - case "contributor": - $this->push( "contributor" ); - xml_set_element_handler( $parser, "in_contributor", "out_contributor" ); - break; - default: - return $this->throwXMLerror( "Element <$name> not allowed in a ." ); - } + function getFilename() { + return $this->filename; + } + + function getSize() { + return $this->size; } + + function getType() { + return $this->type; + } + + function getAction() { + return $this->action; + } + + function getParams() { + return $this->params; + } + + function importOldRevision() { + $dbw = wfGetDB( DB_MASTER ); - function out_revision( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_revision $name" ); - $this->pop(); - if( $name != "revision" ) { - return $this->throwXMLerror( "Expected , got " ); + # Sneak a single revision into place + $user = User::newFromName( $this->getUser() ); + if( $user ) { + $userId = intval( $user->getId() ); + $userText = $user->getName(); + } else { + $userId = 0; + $userText = $this->getUser(); } - xml_set_element_handler( $parser, "in_page", "out_page" ); - if( $this->workRevision ) { - $ok = call_user_func_array( $this->mRevisionCallback, - array( $this->workRevision, $this ) ); - if( $ok ) { - $this->workSuccessCount++; + // avoid memory leak...? + $linkCache = LinkCache::singleton(); + $linkCache->clear(); + + $article = new Article( $this->title ); + $pageId = $article->getId(); + if( $pageId == 0 ) { + # must create the page... + $pageId = $article->insertOn( $dbw ); + $created = true; + } else { + $created = false; + + $prior = $dbw->selectField( 'revision', '1', + array( 'rev_page' => $pageId, + 'rev_timestamp' => $dbw->timestamp( $this->timestamp ), + 'rev_user_text' => $userText, + 'rev_comment' => $this->getComment() ), + __METHOD__ + ); + if( $prior ) { + // FIXME: this could fail slightly for multiple matches :P + wfDebug( __METHOD__ . ": skipping existing revision for [[" . + $this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" ); + return false; } } - } - function in_logitem( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_logitem $name" ); - switch( $name ) { - case "id": - case "timestamp": - case "comment": - case "type": - case "action": - case "logtitle": - case "params": - $this->appendfield = $name; - xml_set_element_handler( $parser, "in_nothing", "out_append" ); - xml_set_character_data_handler( $parser, "char_append" ); - break; - case "contributor": - $this->push( "contributor" ); - xml_set_element_handler( $parser, "in_contributor", "out_contributor" ); - break; - default: - return $this->throwXMLerror( "Element <$name> not allowed in a ." ); - } - } + # FIXME: Use original rev_id optionally (better for backups) + # Insert the row + $revision = new Revision( array( + 'page' => $pageId, + 'text' => $this->getText(), + 'comment' => $this->getComment(), + 'user' => $userId, + 'user_text' => $userText, + 'timestamp' => $this->timestamp, + 'minor_edit' => $this->minor, + ) ); + $revId = $revision->insertOn( $dbw ); + $changed = $article->updateIfNewerOn( $dbw, $revision ); + + # To be on the safe side... + $tempTitle = $GLOBALS['wgTitle']; + $GLOBALS['wgTitle'] = $this->title; + + if( $created ) { + wfDebug( __METHOD__ . ": running onArticleCreate\n" ); + Article::onArticleCreate( $this->title ); + + wfDebug( __METHOD__ . ": running create updates\n" ); + $article->createUpdates( $revision ); + + } elseif( $changed ) { + wfDebug( __METHOD__ . ": running onArticleEdit\n" ); + Article::onArticleEdit( $this->title ); - function out_logitem( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_logitem $name" ); - $this->pop(); - if( $name != "logitem" ) { - return $this->throwXMLerror( "Expected , got " ); + wfDebug( __METHOD__ . ": running edit updates\n" ); + $article->editUpdates( + $this->getText(), + $this->getComment(), + $this->minor, + $this->timestamp, + $revId ); } - xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" ); + $GLOBALS['wgTitle'] = $tempTitle; - if( $this->workRevision ) { - $ok = call_user_func_array( $this->mLogItemCallback, - array( $this->workRevision, $this ) ); - if( $ok ) { - $this->workSuccessCount++; - } + return true; + } + + function importLogItem() { + $dbw = wfGetDB( DB_MASTER ); + # FIXME: this will not record autoblocks + if( !$this->getTitle() ) { + wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " . + $this->timestamp . "\n" ); + return; + } + # Check if it exists already + // FIXME: use original log ID (better for backups) + $prior = $dbw->selectField( 'logging', '1', + array( 'log_type' => $this->getType(), + 'log_action' => $this->getAction(), + 'log_timestamp' => $dbw->timestamp( $this->timestamp ), + 'log_namespace' => $this->getTitle()->getNamespace(), + 'log_title' => $this->getTitle()->getDBkey(), + 'log_comment' => $this->getComment(), + #'log_user_text' => $this->user_text, + 'log_params' => $this->params ), + __METHOD__ + ); + // FIXME: this could fail slightly for multiple matches :P + if( $prior ) { + wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " . + $this->timestamp . "\n" ); + return false; } + $log_id = $dbw->nextSequenceValue( 'logging_log_id_seq' ); + $data = array( + 'log_id' => $log_id, + 'log_type' => $this->type, + 'log_action' => $this->action, + 'log_timestamp' => $dbw->timestamp( $this->timestamp ), + 'log_user' => User::idFromName( $this->user_text ), + #'log_user_text' => $this->user_text, + 'log_namespace' => $this->getTitle()->getNamespace(), + 'log_title' => $this->getTitle()->getDBkey(), + 'log_comment' => $this->getComment(), + 'log_params' => $this->params + ); + $dbw->insert( 'logging', $data, __METHOD__ ); } - function in_upload( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_upload $name" ); - switch( $name ) { - case "timestamp": - case "comment": - case "text": - case "filename": - case "src": - case "size": - $this->appendfield = $name; - xml_set_element_handler( $parser, "in_nothing", "out_append" ); - xml_set_character_data_handler( $parser, "char_append" ); - break; - case "contributor": - $this->push( "contributor" ); - xml_set_element_handler( $parser, "in_contributor", "out_contributor" ); - break; - default: - return $this->throwXMLerror( "Element <$name> not allowed in an ." ); + function importUpload() { + wfDebug( __METHOD__ . ": STUB\n" ); + + /** + // from file revert... + $source = $this->file->getArchiveVirtualUrl( $this->oldimage ); + $comment = $wgRequest->getText( 'wpComment' ); + // TODO: Preserve file properties from database instead of reloading from file + $status = $this->file->upload( $source, $comment, $comment ); + if( $status->isGood() ) { + */ + + /** + // from file upload... + $this->mLocalFile = wfLocalFile( $nt ); + $this->mDestName = $this->mLocalFile->getName(); + //.... + $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, + File::DELETE_SOURCE, $this->mFileProps ); + if ( !$status->isGood() ) { + $resultDetails = array( 'internal' => $status->getWikiText() ); + */ + + // @todo Fixme: upload() uses $wgUser, which is wrong here + // it may also create a page without our desire, also wrong potentially. + // and, it will record a *current* upload, but we might want an archive version here + + $file = wfLocalFile( $this->getTitle() ); + if( !$file ) { + wfDebug( "IMPORT: Bad file. :(\n" ); + return false; } - } - function out_upload( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_revision $name" ); - $this->pop(); - if( $name != "upload" ) { - return $this->throwXMLerror( "Expected , got " ); + $source = $this->downloadSource(); + if( !$source ) { + wfDebug( "IMPORT: Could not fetch remote file. :(\n" ); + return false; } - xml_set_element_handler( $parser, "in_page", "out_page" ); - if( $this->workRevision ) { - $ok = call_user_func_array( $this->mUploadCallback, - array( $this->workRevision, $this ) ); - if( $ok ) { - $this->workUploadSuccessCount++; - } + $status = $file->upload( $source, + $this->getComment(), + $this->getComment(), // Initial page, if none present... + File::DELETE_SOURCE, + false, // props... + $this->getTimestamp() ); + + if( $status->isGood() ) { + // yay? + wfDebug( "IMPORT: is ok?\n" ); + return true; } + + wfDebug( "IMPORT: is bad? " . $status->getXml() . "\n" ); + return false; + } - function in_contributor( $parser, $name, $attribs ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "in_contributor $name" ); - switch( $name ) { - case "username": - case "ip": - case "id": - $this->appendfield = $name; - xml_set_element_handler( $parser, "in_nothing", "out_append" ); - xml_set_character_data_handler( $parser, "char_append" ); - break; - default: - $this->throwXMLerror( "Invalid tag <$name> in " ); + function downloadSource() { + global $wgEnableUploads; + if( !$wgEnableUploads ) { + return false; } - } - function out_contributor( $parser, $name ) { - $name = $this->stripXmlNamespace($name); - $this->debug( "out_contributor $name" ); - $this->pop(); - if( $name != "contributor" ) { - return $this->throwXMLerror( "Expected , got " ); + $tempo = tempnam( wfTempDir(), 'download' ); + $f = fopen( $tempo, 'wb' ); + if( !$f ) { + wfDebug( "IMPORT: couldn't write to temp file $tempo\n" ); + return false; } - $parent = $this->parentTag(); - xml_set_element_handler( $parser, "in_$parent", "out_$parent" ); - } - private function push( $name ) { - array_push( $this->tagStack, $name ); - $this->debug( "PUSH $name" ); - } + // @todo Fixme! + $src = $this->getSrc(); + $data = Http::get( $src ); + if( !$data ) { + wfDebug( "IMPORT: couldn't fetch source $src\n" ); + fclose( $f ); + unlink( $tempo ); + return false; + } - private function pop() { - $name = array_pop( $this->tagStack ); - $this->debug( "POP $name" ); - return $name; - } + fwrite( $f, $data ); + fclose( $f ); - private function parentTag() { - $name = $this->tagStack[count( $this->tagStack ) - 1]; - $this->debug( "PARENT $name" ); - return $name; + return $tempo; } } @@ -1066,27 +1163,27 @@ class ImportStreamSource { static function newFromFile( $filename ) { $file = @fopen( $filename, 'rt' ); if( !$file ) { - return new WikiErrorMsg( "importcantopen" ); + return Status::newFatal( "importcantopen" ); } - return new ImportStreamSource( $file ); + return Status::newGood( new ImportStreamSource( $file ) ); } static function newFromUpload( $fieldname = "xmlimport" ) { $upload =& $_FILES[$fieldname]; if( !isset( $upload ) || !$upload['name'] ) { - return new WikiErrorMsg( 'importnofile' ); + return Status::newFatal( 'importnofile' ); } if( !empty( $upload['error'] ) ) { switch($upload['error']){ case 1: # The uploaded file exceeds the upload_max_filesize directive in php.ini. - return new WikiErrorMsg( 'importuploaderrorsize' ); + return Status::newFatal( 'importuploaderrorsize' ); case 2: # The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form. - return new WikiErrorMsg( 'importuploaderrorsize' ); + return Status::newFatal( 'importuploaderrorsize' ); case 3: # The uploaded file was only partially uploaded - return new WikiErrorMsg( 'importuploaderrorpartial' ); - case 6: #Missing a temporary folder. Introduced in PHP 4.3.10 and PHP 5.0.3. - return new WikiErrorMsg( 'importuploaderrortemp' ); + return Status::newFatal( 'importuploaderrorpartial' ); + case 6: #Missing a temporary folder. + return Status::newFatal( 'importuploaderrortemp' ); # case else: # Currently impossible } @@ -1095,7 +1192,7 @@ class ImportStreamSource { if( is_uploaded_file( $fname ) ) { return ImportStreamSource::newFromFile( $fname ); } else { - return new WikiErrorMsg( 'importnofile' ); + return Status::newFatal( 'importnofile' ); } } @@ -1111,19 +1208,19 @@ class ImportStreamSource { fwrite( $file, $data ); fflush( $file ); fseek( $file, 0 ); - return new ImportStreamSource( $file ); + return Status::newGood( new ImportStreamSource( $file ) ); } else { - return new WikiErrorMsg( 'importcantopen' ); + return Status::newFatal( 'importcantopen' ); } } public static function newFromInterwiki( $interwiki, $page, $history = false, $templates = false, $pageLinkDepth = 0 ) { if( $page == '' ) { - return new WikiErrorMsg( 'import-noarticle' ); + return Status::newFatal( 'import-noarticle' ); } $link = Title::newFromText( "$interwiki:Special:Export/$page" ); if( is_null( $link ) || $link->getInterwiki() == '' ) { - return new WikiErrorMsg( 'importbadinterwiki' ); + return Status::newFatal( 'importbadinterwiki' ); } else { $params = array(); if ( $history ) $params['history'] = 1; -- cgit v1.2.2