$originalDir = getcwd();
-require_once( 'commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
require_once( 'backup.inc' );
-/**
- * Stream wrapper around 7za filter program.
- * Required since we can't pass an open file resource to XMLReader->open()
- * which is used for the text prefetch.
- *
- * @ingroup Maintenance
- */
-class SevenZipStream {
- var $stream;
-
- private function stripPath( $path ) {
- $prefix = 'mediawiki.compress.7z://';
- return substr( $path, strlen( $prefix ) );
- }
-
- function stream_open( $path, $mode, $options, &$opened_path ) {
- if( $mode{0} == 'r' ) {
- $options = 'e -bd -so';
- } elseif( $mode{0} == 'w' ) {
- $options = 'a -bd -si';
- } else {
- return false;
- }
- $arg = wfEscapeShellArg( $this->stripPath( $path ) );
- $command = "7za $options $arg";
- if( !wfIsWindows() ) {
- // Suppress the stupid messages on stderr
- $command .= ' 2>/dev/null';
- }
- $this->stream = popen( $command, $mode );
- return ($this->stream !== false);
- }
-
- function url_stat( $path, $flags ) {
- return stat( $this->stripPath( $path ) );
- }
-
- // This is all so lame; there should be a default class we can extend
-
- function stream_close() {
- return fclose( $this->stream );
- }
-
- function stream_flush() {
- return fflush( $this->stream );
- }
-
- function stream_read( $count ) {
- return fread( $this->stream, $count );
- }
-
- function stream_write( $data ) {
- return fwrite( $this->stream, $data );
- }
-
- function stream_tell() {
- return ftell( $this->stream );
- }
-
- function stream_eof() {
- return feof( $this->stream );
- }
-
- function stream_seek( $offset, $whence ) {
- return fseek( $this->stream, $offset, $whence );
- }
-}
-stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
-
/**
* @ingroup Maintenance
*/
var $failures = 0;
var $maxFailures = 200;
var $failureTimeout = 5; // Seconds to sleep after db failure
-
+
var $php = "php";
var $spawn = false;
var $spawnProc = false;
# Notice messages will foul up your XML output even if they're
# relatively harmless.
- if( ini_get( 'display_errors' ) )
+ if ( ini_get( 'display_errors' ) )
ini_set( 'display_errors', 'stderr' );
$this->initProgress( $this->history );
$input = fopen( $this->input, "rt" );
$result = $this->readDump( $input );
- if( WikiError::isError( $result ) ) {
+ if ( WikiError::isError( $result ) ) {
wfDie( $result->getMessage() );
}
- if( $this->spawnProc ) {
+ if ( $this->spawnProc ) {
$this->closeSpawn();
}
break;
case 'spawn':
$this->spawn = true;
- if( $val ) {
+ if ( $val ) {
$this->php = $val;
}
break;
* Overridden to include prefetch ratio if enabled.
*/
function showReport() {
- if( !$this->prefetch ) {
+ if ( !$this->prefetch ) {
return parent::showReport();
}
- if( $this->reporting ) {
+ if ( $this->reporting ) {
$delta = wfTime() - $this->startTime;
$now = wfTimestamp( TS_DB );
- if( $delta ) {
+ if ( $delta ) {
$rate = $this->pageCount / $delta;
$revrate = $this->revCount / $delta;
$portion = $this->revCount / $this->maxCount;
$bufferSize = 512 * 1024;
do {
$chunk = fread( $input, $bufferSize );
- if( !xml_parse( $parser, $chunk, feof( $input ) ) ) {
+ if ( !xml_parse( $parser, $chunk, feof( $input ) ) ) {
wfDebug( "TextDumpPass::readDump encountered XML parsing error\n" );
return new WikiXmlError( $parser, 'XML import parse failure', $chunk, $offset );
}
$offset += strlen( $chunk );
- } while( $chunk !== false && !feof( $input ) );
+ } while ( $chunk !== false && !feof( $input ) );
xml_parser_free( $parser );
return true;
function getText( $id ) {
$this->fetchCount++;
- if( isset( $this->prefetch ) ) {
+ if ( isset( $this->prefetch ) ) {
$text = $this->prefetch->prefetch( $this->thisPage, $this->thisRev );
- if( $text === null ) {
+ if ( $text === null ) {
// Entry missing from prefetch dump
- } elseif( $text === "" ) {
+ } elseif ( $text === "" ) {
// Blank entries may indicate that the prior dump was broken.
// To be safe, reload it.
} else {
}
private function doGetText( $id ) {
- if( $this->spawn ) {
+ if ( $this->spawn ) {
return $this->getTextSpawned( $id );
} else {
return $this->getTextDbSafe( $id );
* may not survive a long-term server outage.
*/
private function getTextDbSafe( $id ) {
- while( true ) {
+ while ( true ) {
try {
$text = $this->getTextDb( $id );
- $ex = new MWException("Graceful storage failure");
- } catch (DBQueryError $ex) {
+ $ex = new MWException( "Graceful storage failure" );
+ } catch ( DBQueryError $ex ) {
$text = false;
}
- if( $text === false ) {
+ if ( $text === false ) {
$this->failures++;
- if( $this->failures > $this->maxFailures ) {
+ if ( $this->failures > $this->maxFailures ) {
throw $ex;
} else {
$this->progress( "Database failure $this->failures " .
* May throw a database error if, say, the server dies during query.
*/
private function getTextDb( $id ) {
+ global $wgContLang;
$id = intval( $id );
$row = $this->db->selectRow( 'text',
array( 'old_text', 'old_flags' ),
array( 'old_id' => $id ),
'TextPassDumper::getText' );
$text = Revision::getRevisionText( $row );
- if( $text === false ) {
+ if ( $text === false ) {
return false;
}
$stripped = str_replace( "\r", "", $text );
- $normalized = UtfNormal::cleanUp( $stripped );
+ $normalized = $wgContLang->normalize( $stripped );
return $normalized;
}
private function getTextSpawned( $id ) {
wfSuppressWarnings();
- if( !$this->spawnProc ) {
+ if ( !$this->spawnProc ) {
// First time?
$this->openSpawn();
}
- while( true ) {
+ while ( true ) {
$text = $this->getTextSpawnedOnce( $id );
- if( !is_string( $text ) ) {
- $this->progress("Database subprocess failed. Respawning...");
+ if ( !is_string( $text ) ) {
+ $this->progress( "Database subprocess failed. Respawning..." );
$this->closeSpawn();
sleep( $this->failureTimeout );
$this->progress( "Spawning database subprocess: $cmd" );
$this->spawnProc = proc_open( $cmd, $spec, $pipes );
- if( !$this->spawnProc ) {
+ if ( !$this->spawnProc ) {
// shit
$this->progress( "Subprocess spawn failed." );
return false;
private function closeSpawn() {
wfSuppressWarnings();
- if( $this->spawnRead )
+ if ( $this->spawnRead )
fclose( $this->spawnRead );
$this->spawnRead = false;
- if( $this->spawnWrite )
+ if ( $this->spawnWrite )
fclose( $this->spawnWrite );
$this->spawnWrite = false;
- if( $this->spawnErr )
+ if ( $this->spawnErr )
fclose( $this->spawnErr );
$this->spawnErr = false;
- if( $this->spawnProc )
+ if ( $this->spawnProc )
pclose( $this->spawnProc );
$this->spawnProc = false;
wfRestoreWarnings();
}
private function getTextSpawnedOnce( $id ) {
+ global $wgContLang;
+
$ok = fwrite( $this->spawnWrite, "$id\n" );
- //$this->progress( ">> $id" );
- if( !$ok ) return false;
+ // $this->progress( ">> $id" );
+ if ( !$ok ) return false;
$ok = fflush( $this->spawnWrite );
- //$this->progress( ">> [flush]" );
- if( !$ok ) return false;
+ // $this->progress( ">> [flush]" );
+ if ( !$ok ) return false;
$len = fgets( $this->spawnRead );
- //$this->progress( "<< " . trim( $len ) );
- if( $len === false ) return false;
+ // $this->progress( "<< " . trim( $len ) );
+ if ( $len === false ) return false;
$nbytes = intval( $len );
$text = "";
// Subprocess may not send everything at once, we have to loop.
- while( $nbytes > strlen( $text ) ) {
+ while ( $nbytes > strlen( $text ) ) {
$buffer = fread( $this->spawnRead, $nbytes - strlen( $text ) );
- if( $text === false ) break;
+ if ( $buffer === false ) break;
$text .= $buffer;
}
$gotbytes = strlen( $text );
- if( $gotbytes != $nbytes ) {
- $this->progress( "Expected $nbytes bytes from database subprocess, got $gotbytes ");
+ if ( $gotbytes != $nbytes ) {
+ $this->progress( "Expected $nbytes bytes from database subprocess, got $gotbytes " );
return false;
}
// Do normalization in the dump thread...
$stripped = str_replace( "\r", "", $text );
- $normalized = UtfNormal::cleanUp( $stripped );
+ $normalized = $wgContLang->normalize( $stripped );
return $normalized;
}
$this->clearOpenElement( null );
$this->lastName = $name;
- if( $name == 'revision' ) {
+ if ( $name == 'revision' ) {
$this->state = $name;
$this->egress->writeOpenPage( null, $this->buffer );
$this->buffer = "";
- } elseif( $name == 'page' ) {
+ } elseif ( $name == 'page' ) {
$this->state = $name;
- if( $this->atStart ) {
+ if ( $this->atStart ) {
$this->egress->writeOpenStream( $this->buffer );
$this->buffer = "";
$this->atStart = false;
}
}
- if( $name == "text" && isset( $attribs['id'] ) ) {
+ if ( $name == "text" && isset( $attribs['id'] ) ) {
$text = $this->getText( $attribs['id'] );
$this->openElement = array( $name, array( 'xml:space' => 'preserve' ) );
- if( strlen( $text ) > 0 ) {
+ if ( strlen( $text ) > 0 ) {
$this->characterData( $parser, $text );
}
} else {
}
function endElement( $parser, $name ) {
- if( $this->openElement ) {
+ if ( $this->openElement ) {
$this->clearOpenElement( "" );
} else {
$this->buffer .= "</$name>";
}
- if( $name == 'revision' ) {
+ if ( $name == 'revision' ) {
$this->egress->writeRevision( null, $this->buffer );
$this->buffer = "";
$this->thisRev = "";
- } elseif( $name == 'page' ) {
+ } elseif ( $name == 'page' ) {
$this->egress->writeClosePage( $this->buffer );
$this->buffer = "";
$this->thisPage = "";
- } elseif( $name == 'mediawiki' ) {
+ } elseif ( $name == 'mediawiki' ) {
$this->egress->writeCloseStream( $this->buffer );
$this->buffer = "";
}
function characterData( $parser, $data ) {
$this->clearOpenElement( null );
- if( $this->lastName == "id" ) {
- if( $this->state == "revision" ) {
+ if ( $this->lastName == "id" ) {
+ if ( $this->state == "revision" ) {
$this->thisRev .= $data;
- } elseif( $this->state == "page" ) {
+ } elseif ( $this->state == "page" ) {
$this->thisPage .= $data;
}
}
}
function clearOpenElement( $style ) {
- if( $this->openElement ) {
+ if ( $this->openElement ) {
$this->buffer .= Xml::element( $this->openElement[0], $this->openElement[1], $style );
$this->openElement = false;
}
$dumper = new TextPassDumper( $argv );
-if( true ) {
+if ( true ) {
$dumper->dump();
} else {
$dumper->progress( <<<ENDS
dépôts / lhc / web / wiklou.git / blobdiff