* @subpackage SpecialPage
*/
-/** */
-require_once( 'WikiError.php' );
-
/**
* Constructor
*/
function wfSpecialImport( $page = '' ) {
global $wgUser, $wgOut, $wgRequest, $wgTitle, $wgImportSources;
+ global $wgImportTargetNamespace;
- ###
-# $wgOut->addWikiText( "Special:Import is not ready for this beta release, sorry." );
-# return;
- ###
-
+ $interwiki = false;
+ $namespace = $wgImportTargetNamespace;
+ $frompage = '';
+ $history = true;
+
if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
+ $isUpload = false;
+ $namespace = $wgRequest->getIntOrNull( 'namespace' );
+
switch( $wgRequest->getVal( "source" ) ) {
case "upload":
+ $isUpload = true;
if( $wgUser->isAllowed( 'importupload' ) ) {
$source = ImportStreamSource::newFromUpload( "xmlimport" );
} else {
}
break;
case "interwiki":
+ $interwiki = $wgRequest->getVal( 'interwiki' );
+ $history = $wgRequest->getCheck( 'interwikiHistory' );
+ $frompage = $wgRequest->getText( "frompage" );
$source = ImportStreamSource::newFromInterwiki(
- $wgRequest->getVal( "interwiki" ),
- $wgRequest->getText( "frompage" ) );
+ $interwiki,
+ $frompage,
+ $history );
break;
default:
- $source = new WikiError( "Unknown import source type" );
+ $source = new WikiErrorMsg( "importunknownsource" );
}
if( WikiError::isError( $source ) ) {
$wgOut->addWikiText( wfEscapeWikiText( $source->getMessage() ) );
} else {
+ $wgOut->addWikiText( wfMsg( "importstart" ) );
+
$importer = new WikiImporter( $source );
+ if( !is_null( $namespace ) ) {
+ $importer->setTargetNamespace( $namespace );
+ }
+ $reporter = new ImportReporter( $importer, $isUpload, $interwiki );
+
+ $reporter->open();
$result = $importer->doImport();
+ $reporter->close();
+
if( WikiError::isError( $result ) ) {
$wgOut->addWikiText( wfMsg( "importfailed",
wfEscapeWikiText( $result->getMessage() ) ) );
$wgOut->addHTML( "
<fieldset>
<legend>" . wfMsgHtml('importinterwiki') . "</legend>
- <form method='post' action=\"$action\">
+ <form method='post' action=\"$action\">" .
+ $wgOut->parse( wfMsg( 'import-interwiki-text' ) ) . "
<input type='hidden' name='action' value='submit' />
<input type='hidden' name='source' value='interwiki' />
- <select name='interwiki'>
-" );
- foreach( $wgImportSources as $interwiki ) {
- $iw = htmlspecialchars( $interwiki );
- $wgOut->addHTML( "<option value=\"$iw\">$iw</option>\n" );
+ <table>
+ <tr>
+ <td>
+ <select name='interwiki'>" );
+ foreach( $wgImportSources as $prefix ) {
+ $iw = htmlspecialchars( $prefix );
+ $selected = ($interwiki === $prefix) ? ' selected="selected"' : '';
+ $wgOut->addHTML( "<option value=\"$iw\"$selected>$iw</option>\n" );
}
$wgOut->addHTML( "
- </select>
- <input name='frompage' />
- <input type='submit' />
+ </select>
+ </td>
+ <td>" .
+ wfInput( 'frompage', 50, $frompage ) .
+ "</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>" .
+ wfCheckLabel( wfMsg( 'import-interwiki-history' ),
+ 'interwikiHistory', 'interwikiHistory', $history ) .
+ "</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ " . wfMsgHtml( 'import-interwiki-namespace' ) . " " .
+ HTMLnamespaceselector( $namespace, '' ) . "
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>" .
+ wfSubmitButton( wfMsg( 'import-interwiki-submit' ) ) .
+ "</td>
+ </tr>
+ </table>
</form>
</fieldset>
" );
}
}
+/**
+ * Reporting callback
+ */
+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 );
+
+ $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) .
+ " " .
+ wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
+ "</li>\n" );
+
+ if( $successCount > 0 ) {
+ $log = new LogPage( 'import' );
+ if( $this->mIsUpload ) {
+ $detail = wfMsgForContent( 'import-logentry-upload-detail',
+ $contentCount );
+ $log->addEntry( 'upload', $title, $detail );
+ } else {
+ $interwiki = '[[:' . $this->mInterwiki . ':' .
+ $origTitle->getPrefixedText() . ']]';
+ $detail = wfMsgForContent( 'import-logentry-interwiki-detail',
+ $contentCount, $interwiki );
+ $log->addEntry( 'interwiki', $title, $detail );
+ }
+
+ $comment = $detail; // quick
+ $dbw = wfGetDB( DB_MASTER );
+ $nullRevision = Revision::newNullRevision(
+ $dbw, $title->getArticleId(), $comment, true );
+ $nullRevId = $nullRevision->insertOn( $dbw );
+ }
+ }
+
+ function close() {
+ global $wgOut;
+ if( $this->mPageCount == 0 ) {
+ $wgOut->addHtml( "<li>" . wfMsgHtml( 'importnopages' ) . "</li>\n" );
+ }
+ $wgOut->addHtml( "</ul>\n" );
+ }
+}
+
/**
*
* @package MediaWiki
* @subpackage SpecialPage
*/
class WikiRevision {
- var $title = NULL;
+ var $title = null;
var $id = 0;
var $timestamp = "20010115000000";
var $user = 0;
var $comment = "";
var $minor = false;
- function setTitle( $text ) {
- $this->title = Title::newFromText( $text );
+ function setTitle( $title ) {
+ if( is_object( $title ) ) {
+ $this->title = $title;
+ } elseif( is_null( $title ) ) {
+ throw new MWException( "WikiRevision given a null title in import." );
+ } else {
+ throw new MWException( "WikiRevision given non-object title in import." );
+ }
}
function setID( $id ) {
if( $pageId == 0 ) {
# must create the page...
$pageId = $article->insertOn( $dbw );
+ $created = true;
+ } else {
+ $created = false;
+
+ $prior = Revision::loadFromTimestamp( $dbw, $this->title, $this->timestamp );
+ if( !is_null( $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;
+ }
}
-
- # FIXME: Check for exact conflicts
+
# FIXME: Use original rev_id optionally
# FIXME: blah blah blah
'minor_edit' => $this->minor,
) );
$revId = $revision->insertOn( $dbw );
- $article->updateIfNewerOn( $dbw, $revision );
+ $changed = $article->updateIfNewerOn( $dbw, $revision );
+ if( $created ) {
+ wfDebug( __METHOD__ . ": running onArticleCreate\n" );
+ Article::onArticleCreate( $this->title );
+ } else {
+ if( $changed ) {
+ wfDebug( __METHOD__ . ": running onArticleEdit\n" );
+ Article::onArticleEdit( $this->title );
+ }
+ }
+ if( $created || $changed ) {
+ wfDebug( __METHOD__ . ": running edit updates\n" );
+ $article->editUpdates(
+ $this->getText(),
+ $this->getComment(),
+ $this->minor,
+ $this->timestamp,
+ $revId );
+ }
+
return true;
}
class WikiImporter {
var $mSource = null;
var $mPageCallback = null;
+ var $mPageOutCallback = null;
var $mRevisionCallback = null;
+ var $mTargetNamespace = null;
var $lastfield;
function WikiImporter( $source ) {
return $previous;
}
+ /**
+ * 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 callable $callback
+ * @return callable
+ */
+ function setPageOutCallback( $callback ) {
+ $previous = $this->mPageOutCallback;
+ $this->mPageOutCallback = $callback;
+ return $previous;
+ }
+
/**
* Sets the action to perform as each page revision is reached.
* @param callable $callback
$this->mRevisionCallback = $callback;
return $previous;
}
+
+ /**
+ * 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 );
+ } else {
+ return false;
+ }
+ }
/**
* Default per-revision callback, performs the import.
* @param WikiRevision $revision
- * @access private
+ * @private
*/
function importRevision( &$revision ) {
$dbw =& wfGetDB( DB_MASTER );
- $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
+ return $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
}
/**
* Alternate per-revision callback, for debugging.
* @param WikiRevision $revision
- * @access private
+ * @private
*/
function debugRevisionHandler( &$revision ) {
$this->debug( "Got revision:" );
/**
* Notify the callback function when a new <page> is reached.
* @param Title $title
- * @access private
+ * @private
*/
function pageCallback( $title ) {
if( is_callable( $this->mPageCallback ) ) {
}
}
+ /**
+ * Notify the callback function when a </page> is closed.
+ * @param Title $title
+ * @param Title $origTitle
+ * @param int $revisionCount
+ * @param int $successCount 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 );
+ }
+ }
+
# XML parser callbacks from here out -- beware!
function donothing( $parser, $x, $y="" ) {
if( $name == 'siteinfo' ) {
xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
} elseif( $name == 'page' ) {
+ $this->workRevisionCount = 0;
+ $this->workSuccessCount = 0;
xml_set_element_handler( $parser, "in_page", "out_page" );
} else {
return $this->throwXMLerror( "Expected <page>, got <$name>" );
break;
case "revision":
$this->workRevision = new WikiRevision;
- $this->workRevision->setTitle( $this->workTitle );
+ $this->workRevision->setTitle( $this->pageTitle );
+ $this->workRevisionCount++;
xml_set_element_handler( $parser, "in_revision", "out_revision" );
break;
default:
}
xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
- $this->workTitle = NULL;
- $this->workRevision = NULL;
+ $this->pageOutCallback( $this->pageTitle, $this->origTitle,
+ $this->workRevisionCount, $this->workSuccessCount );
+
+ $this->workTitle = null;
+ $this->workRevision = null;
+ $this->workRevisionCount = 0;
+ $this->workSuccessCount = 0;
+ $this->pageTitle = null;
+ $this->origTitle = null;
}
function in_nothing( $parser, $name, $attribs ) {
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 );
+ }
$this->pageCallback( $this->workTitle );
break;
case "id":
}
xml_set_element_handler( $parser, "in_page", "out_page" );
- $out = call_user_func_array( $this->mRevisionCallback,
+ $ok = call_user_func_array( $this->mRevisionCallback,
array( &$this->workRevision, &$this ) );
- if( !empty( $out ) ) {
- global $wgOut;
- $wgOut->addHTML( "<li>" . $out . "</li>\n" );
+ if( $ok ) {
+ $this->workSuccessCount++;
}
}
function newFromFile( $filename ) {
$file = @fopen( $filename, 'rt' );
if( !$file ) {
- return new WikiError( "Couldn't open import file" );
+ return new WikiErrorMsg( "importcantopen" );
}
return new ImportStreamSource( $file );
}
}
function newFromURL( $url ) {
+ wfDebug( __METHOD__ . ": opening $url\n" );
# fopen-wrappers are normally turned off for security.
ini_set( "allow_url_fopen", true );
$ret = ImportStreamSource::newFromFile( $url );
return $ret;
}
- function newFromInterwiki( $interwiki, $page ) {
+ function newFromInterwiki( $interwiki, $page, $history=false ) {
$base = Title::getInterwikiLink( $interwiki );
- if( empty( $base ) ) {
- return new WikiError( 'Bad interwiki link' );
+ $link = Title::newFromText( "$interwiki:Special:Export/$page" );
+ if( empty( $base ) || empty( $link ) ) {
+ return new WikiErrorMsg( 'importbadinterwiki' );
} else {
- $import = wfUrlencode( "Special:Export/$page" );
- $url = str_replace( "$1", $import, $base );
+ $params = $history ? 'history=1' : '';
+ $url = $link->getFullUrl( $params );
return ImportStreamSource::newFromURL( $url );
}
}
dépôts / lhc / web / wiklou.git / blobdiff