* @file
* @ingroup SpecialPage
*/
-
-/**
- * Reporting callback
- * @ingroup SpecialPage
- */
-class ImportReporter {
- function __construct( $importer, $upload, $interwiki ) {
- $importer->setPageOutCallback( array( $this, 'reportPage' ) );
- $this->mPageCount = 0;
- $this->mIsUpload = $upload;
- $this->mInterwiki = $interwiki;
- }
-
- function open() {
- global $wgOut;
- $wgOut->addHtml( "<ul>\n" );
- }
-
- function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
- global $wgOut, $wgUser, $wgLang, $wgContLang;
-
- $skin = $wgUser->getSkin();
-
- $this->mPageCount++;
-
- $localCount = $wgLang->formatNum( $successCount );
- $contentCount = $wgContLang->formatNum( $successCount );
-
- if( $successCount > 0 ) {
- $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
- wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
- "</li>\n"
- );
-
- $log = new LogPage( 'import' );
- if( $this->mIsUpload ) {
- $detail = wfMsgExt( 'import-logentry-upload-detail', array( 'content', 'parsemag' ),
- $contentCount );
- $log->addEntry( 'upload', $title, $detail );
- } else {
- $interwiki = '[[:' . $this->mInterwiki . ':' .
- $origTitle->getPrefixedText() . ']]';
- $detail = wfMsgExt( 'import-logentry-interwiki-detail', array( 'content', 'parsemag' ),
- $contentCount, $interwiki );
- $log->addEntry( 'interwiki', $title, $detail );
- }
-
- $comment = $detail; // quick
- $dbw = wfGetDB( DB_MASTER );
- $latest = $title->getLatestRevID();
- $nullRevision = Revision::newNullRevision( $dbw, $title->getArticleId(), $comment, true );
- $nullRevision->insertOn( $dbw );
- $article = new Article( $title );
- # Update page record
- $article->updateRevisionOn( $dbw, $nullRevision );
- wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
- } else {
- $wgOut->addHtml( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
- }
- }
-
- function close() {
- global $wgOut;
- if( $this->mPageCount == 0 ) {
- $wgOut->addHtml( "</ul>\n" );
- return new WikiErrorMsg( "importnopages" );
- }
- $wgOut->addHtml( "</ul>\n" );
-
- return $this->mPageCount;
- }
-}
/**
*
var $text = "";
var $comment = "";
var $minor = false;
+ var $type = "";
+ var $action = "";
+ var $params = "";
function setTitle( $title ) {
if( is_object( $title ) ) {
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 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 );
} else {
$created = false;
- $prior = Revision::loadFromTimestamp( $dbw, $this->title, $this->timestamp );
- if( !is_null( $prior ) ) {
+ $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" );
+ $this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" );
return false;
}
}
- # FIXME: Use original rev_id optionally
- # FIXME: blah blah blah
-
- #if( $numrows > 0 ) {
- # return wfMsg( "importhistoryconflict" );
- #}
-
+ # FIXME: Use original rev_id optionally (better for backups)
# Insert the row
$revision = new Revision( array(
'page' => $pageId,
) );
$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" );
$this->timestamp,
$revId );
}
+ $GLOBALS['wgTitle'] = $tempTitle;
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( 'log_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 importUpload() {
wfDebug( __METHOD__ . ": STUB\n" );
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();
function __construct( $source ) {
$this->setRevisionCallback( array( $this, "importRevision" ) );
$this->setUploadCallback( array( $this, "importUpload" ) );
+ $this->setLogItemCallback( array( $this, "importLogItem" ) );
$this->mSource = $source;
}
wfDebug( "WikiImporter XML error: $err\n" );
}
+ function handleXmlNamespace ( $parser, $data, $prefix=false, $uri=false ) {
+ if( preg_match( '/www.mediawiki.org/',$prefix ) ) {
+ $prefix = str_replace( '/','\/',$prefix );
+ $this->mXmlNamespace='/^'.$prefix.':/';
+ }
+ }
+
+ function stripXmlNamespace($name) {
+ if( $this->mXmlNamespace ) {
+ return(preg_replace($this->mXmlNamespace,'',$name,1));
+ }
+ else {
+ return($name);
+ }
+ }
+
# --------------
function doImport() {
return new WikiErrorMsg( "importnotext" );
}
- $parser = xml_parser_create( "UTF-8" );
+ $parser = xml_parser_create_ns( "UTF-8" );
# case folding violates XML standard, turn it off
xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
xml_set_object( $parser, $this );
xml_set_element_handler( $parser, "in_start", "" );
+ xml_set_start_namespace_decl_handler( $parser, "handleXmlNamespace" );
$offset = 0; // for context extraction on error reporting
do {
$this->mUploadCallback = $callback;
return $previous;
}
+
+ /**
+ * 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;
+ }
/**
* Set a target namespace to override the defaults
$dbw = wfGetDB( DB_MASTER );
return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
}
+
+ /**
+ * Default per-revision callback, performs the import.
+ * @param $revision WikiRevision
+ * @private
+ */
+ function importLogItem( $rev ) {
+ $dbw = wfGetDB( DB_MASTER );
+ return $dbw->deadlockLoop( array( $rev, 'importLogItem' ) );
+ }
/**
* Dummy for now...
}
}
-
# XML parser callbacks from here out -- beware!
function donothing( $parser, $x, $y="" ) {
#$this->debug( "donothing" );
}
function in_start( $parser, $name, $attribs ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_start $name" );
if( $name != "mediawiki" ) {
return $this->throwXMLerror( "Expected <mediawiki>, got <$name>" );
}
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" );
$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 <page>, got <$name>" );
}
}
function out_mediawiki( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_mediawiki $name" );
if( $name != "mediawiki" ) {
return $this->throwXMLerror( "Expected </mediawiki>, got </$name>" );
function in_siteinfo( $parser, $name, $attribs ) {
// no-ops for now
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_siteinfo $name" );
switch( $name ) {
case "sitename":
}
function out_siteinfo( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
if( $name == "siteinfo" ) {
xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
}
function in_page( $parser, $name, $attribs ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_page $name" );
switch( $name ) {
case "id":
}
function out_page( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_page $name" );
$this->pop();
if( $name != "page" ) {
}
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 char_append( $parser, $data ) {
$this->debug( "char_append '$data'" );
$this->appenddata .= $data;
}
+
function out_append( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_append $name" );
if( $name != $this->appendfield ) {
return $this->throwXMLerror( "Expected </{$this->appendfield}>, got </$name>" );
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' ) {
+ if ( $this->parentTag() == 'revision' || $this->parentTag() == 'logitem' ) {
if( $this->workRevision )
$this->workRevision->setID( $this->appenddata );
}
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 );
}
function in_revision( $parser, $name, $attribs ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_revision $name" );
switch( $name ) {
case "id":
}
function out_revision( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_revision $name" );
$this->pop();
if( $name != "revision" ) {
}
}
}
+
+ 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 <revision>." );
+ }
+ }
+
+ function out_logitem( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
+ $this->debug( "out_logitem $name" );
+ $this->pop();
+ if( $name != "logitem" ) {
+ return $this->throwXMLerror( "Expected </logitem>, got </$name>" );
+ }
+ xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+
+ if( $this->workRevision ) {
+ $ok = call_user_func_array( $this->mLogItemCallback,
+ array( $this->workRevision, $this ) );
+ if( $ok ) {
+ $this->workSuccessCount++;
+ }
+ }
+ }
function in_upload( $parser, $name, $attribs ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_upload $name" );
switch( $name ) {
case "timestamp":
}
function out_upload( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_revision $name" );
$this->pop();
if( $name != "upload" ) {
}
function in_contributor( $parser, $name, $attribs ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "in_contributor $name" );
switch( $name ) {
case "username":
}
function out_contributor( $parser, $name ) {
+ $name = $this->stripXmlNamespace($name);
$this->debug( "out_contributor $name" );
$this->pop();
if( $name != "contributor" ) {
}
}
- public static function newFromInterwiki( $interwiki, $page, $history=false ) {
+ public static function newFromInterwiki( $interwiki, $page, $history = false, $templates = false, $pageLinkDepth = 0 ) {
if( $page == '' ) {
return new WikiErrorMsg( 'import-noarticle' );
}
if( is_null( $link ) || $link->getInterwiki() == '' ) {
return new WikiErrorMsg( 'importbadinterwiki' );
} else {
- $params = $history ? 'history=1' : '';
+ $params = array();
+ if ( $history ) $params['history'] = 1;
+ if ( $templates ) $params['templates'] = 1;
+ if ( $pageLinkDepth ) $params['pagelink-depth'] = $pageLinkDepth;
$url = $link->getFullUrl( $params );
# For interwikis, use POST to avoid redirects.
return ImportStreamSource::newFromURL( $url, "POST" );
dépôts / lhc / web / wiklou.git / blobdiff