From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 13 Jul 2006 17:38:01 +0000 (+0000)
Subject: Abstract out some of the cleanupTitles code to reuse it
X-Git-Tag: 1.31.0-rc.0~56268
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=3ea252c5b194f9f21d62a871ce526a2136aa861e;p=lhc%2Fweb%2Fwiklou.git

Abstract out some of the cleanupTitles code to reuse it
---

diff --git a/maintenance/cleanupTable.inc b/maintenance/cleanupTable.inc
new file mode 100644
index 0000000000..fd9b5af834
--- /dev/null
+++ b/maintenance/cleanupTable.inc
@@ -0,0 +1,83 @@
+<?php
+
+require_once( 'FiveUpgrade.inc' );
+
+abstract class TableCleanup extends FiveUpgrade {
+	function __construct( $table, $dryrun = false ) {
+		parent::__construct();
+
+		$this->targetTable = $table;
+		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
+		$this->dryrun = $dryrun;
+	}
+
+	function cleanup() {
+		if( $this->dryrun ) {
+			echo "Checking for bad titles...\n";
+		} else {
+			echo "Checking and fixing bad titles...\n";
+		}
+		$this->runTable( $this->targetTable,
+			'', //'WHERE page_namespace=0',
+			array( $this, 'processPage' ) );
+	}
+
+	function init( $count, $table ) {
+		$this->processed = 0;
+		$this->updated = 0;
+		$this->count = $count;
+		$this->startTime = wfTime();
+		$this->table = $table;
+	}
+
+	function progress( $updated ) {
+		$this->updated += $updated;
+		$this->processed++;
+		if( $this->processed % 100 != 0 ) {
+			return;
+		}
+		$portion = $this->processed / $this->count;
+		$updateRate = $this->updated / $this->processed;
+
+		$now = wfTime();
+		$delta = $now - $this->startTime;
+		$estimatedTotalTime = $delta / $portion;
+		$eta = $this->startTime + $estimatedTotalTime;
+
+		global $wgDBname;
+		printf( "%s %s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n",
+			$wgDBname,
+			wfTimestamp( TS_DB, intval( $now ) ),
+			$portion * 100.0,
+			$this->table,
+			wfTimestamp( TS_DB, intval( $eta ) ),
+			$this->processed,
+			$this->count,
+			$this->processed / $delta,
+			$updateRate * 100.0 );
+		flush();
+	}
+
+	function runTable( $table, $where, $callback ) {
+		$fname = 'CapsCleanup::buildTable';
+
+		$count = $this->dbw->selectField( $table, 'count(*)', '', $fname );
+		$this->init( $count, $table );
+		$this->log( "Processing $table..." );
+
+		$tableName = $this->dbr->tableName( $table );
+		$sql = "SELECT * FROM $tableName $where";
+		$result = $this->dbr->query( $sql, $fname );
+
+		while( $row = $this->dbr->fetchObject( $result ) ) {
+			$updated = call_user_func( $callback, $row );
+		}
+		$this->log( "Finished $table... $this->updated of $this->processed rows updated" );
+		$this->dbr->freeResult( $result );
+	}
+	
+	abstract function processPage( $row );
+	
+}
+
+?>
\ No newline at end of file
diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 647314f78b..6971099b02 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -30,79 +30,11 @@
  */
 
 require_once( 'commandLine.inc' );
-require_once( 'FiveUpgrade.inc' );
+require_once( 'cleanupTable.inc' );
 
-class TitleCleanup extends FiveUpgrade {
-	function TitleCleanup( $dryrun = false ) {
-		parent::FiveUpgrade();
-
-		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
-		$this->dryrun = $dryrun;
-	}
-
-	function cleanup() {
-		if( $this->dryrun ) {
-			echo "Checking for bad titles...\n";
-		} else {
-			echo "Checking and fixing bad titles...\n";
-		}
-		$this->runTable( 'page',
-			'', //'WHERE page_namespace=0',
-			array( &$this, 'processPage' ) );
-	}
-
-	function init( $count, $table ) {
-		$this->processed = 0;
-		$this->updated = 0;
-		$this->count = $count;
-		$this->startTime = wfTime();
-		$this->table = $table;
-	}
-
-	function progress( $updated ) {
-		$this->updated += $updated;
-		$this->processed++;
-		if( $this->processed % 100 != 0 ) {
-			return;
-		}
-		$portion = $this->processed / $this->count;
-		$updateRate = $this->updated / $this->processed;
-
-		$now = wfTime();
-		$delta = $now - $this->startTime;
-		$estimatedTotalTime = $delta / $portion;
-		$eta = $this->startTime + $estimatedTotalTime;
-
-		global $wgDBname;
-		printf( "%s %s: %6.2f%% done on %s; ETA %s [%d/%d] %.2f/sec <%.2f%% updated>\n",
-			$wgDBname,
-			wfTimestamp( TS_DB, intval( $now ) ),
-			$portion * 100.0,
-			$this->table,
-			wfTimestamp( TS_DB, intval( $eta ) ),
-			$this->processed,
-			$this->count,
-			$this->processed / $delta,
-			$updateRate * 100.0 );
-		flush();
-	}
-
-	function runTable( $table, $where, $callback ) {
-		$fname = 'CapsCleanup::buildTable';
-
-		$count = $this->dbw->selectField( $table, 'count(*)', '', $fname );
-		$this->init( $count, 'page' );
-		$this->log( "Processing $table..." );
-
-		$tableName = $this->dbr->tableName( $table );
-		$sql = "SELECT * FROM $tableName $where";
-		$result = $this->dbr->query( $sql, $fname );
-
-		while( $row = $this->dbr->fetchObject( $result ) ) {
-			$updated = call_user_func( $callback, $row );
-		}
-		$this->log( "Finished $table... $this->updated of $this->processed rows updated" );
-		$this->dbr->freeResult( $result );
+class TitleCleanup extends TableCleanup {
+	function __construct( $dryrun = false ) {
+		parent::__construct( 'page', $dryrun );
 	}
 
 	function processPage( $row ) {