From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 22 Feb 2009 13:37:51 +0100
Subject: updated to MediaWiki 1.14.0

---
 maintenance/importDump.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'maintenance/importDump.php')

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 99e69ce8..eb51126a 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -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,7 +101,11 @@ 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);
 	}
@@ -129,6 +139,8 @@ class BackupReader {
 			array( &$this, 'handleRevision' ) );
 		$this->uploadCallback = $importer->setUploadCallback(
 			array( &$this, 'handleUpload' ) );
+		$this->logItemCallback = $importer->setLogItemCallback(
+			array( &$this, 'handleLogItem' ) );
 
 		return $importer->doImport();
 	}
-- 
cgit v1.2.2