Cleaned up img_auth code and re-integrated core img-auth- messages.

[lhc/web/wiklou.git] / maintenance / importDump.php

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index d74e32b..714d76d 100644 (file)
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -24,7 +24,7 @@
 
 $optionsWithArgs = array( 'report' );
 
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 
 /**
  * @ingroup Maintenance
@@ -48,13 +48,10 @@ class BackupReader {
 
        function handleRevision( $rev ) {
                $title = $rev->getTitle();
-               if (!$title) {
+               if( !$title ) {
                        $this->progress( "Got bogus revision with null title!" );
                        return;
                }
-               #$timestamp = $rev->getTimestamp();
-               #$display = $title->getPrefixedText();
-               #echo "$display $timestamp\n";
 
                $this->revCount++;
                $this->report();
@@ -79,6 +76,15 @@ class BackupReader {
                }
        }
 
+       function handleLogItem( $rev ) {
+               $this->revCount++;
+               $this->report();
+
+               if( !$this->dryRun ) {
+                       call_user_func( $this->logItemCallback, $rev );
+               }
+       }
+
        function report( $final = false ) {
                if( $final xor ( $this->pageCount % $this->reportingInterval == 0 ) ) {
                        $this->showReport();
@@ -95,8 +101,13 @@ class BackupReader {
                                $rate = '-';
                                $revrate = '-';
                        }
-                       $this->progress( "$this->pageCount ($rate pages/sec $revrate revs/sec)" );
+                       # Logs dumps don't have page tallies
+                       if( $this->pageCount )
+                               $this->progress( "$this->pageCount ($rate pages/sec $revrate revs/sec)" );
+                       else
+                               $this->progress( "$this->revCount ($revrate revs/sec)" );
                }
+               wfWaitForSlaves(5);
        }
 
        function progress( $string ) {
@@ -104,10 +115,19 @@ class BackupReader {
        }
 
        function importFromFile( $filename ) {
+               $t = true;
                if( preg_match( '/\.gz$/', $filename ) ) {
                        $filename = 'compress.zlib://' . $filename;
                }
-               $file = fopen( $filename, 'rt' );
+               elseif( preg_match( '/\.bz2$/', $filename ) ) {
+                       $filename = 'compress.bzip2://' . $filename;
+               }
+               elseif( preg_match( '/\.7z$/', $filename ) ) {
+                       $filename = 'mediawiki.compress.7z://' . $filename;
+                       $t = false;
+               }
+
+               $file = fopen( $filename, $t ? 'rt' : 't' ); //our 7zip wrapper uses popen, which seems not to like two-letter modes
                return $this->importFromHandle( $file );
        }
 
@@ -128,6 +148,8 @@ class BackupReader {
                        array( &$this, 'handleRevision' ) );
                $this->uploadCallback = $importer->setUploadCallback(
                        array( &$this, 'handleUpload' ) );
+               $this->logItemCallback = $importer->setLogItemCallback(
+                       array( &$this, 'handleLogItem' ) );
 
                return $importer->doImport();
        }