X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupTitles.php;h=0fb97c6e574f31724b09beca1a1a201537208b5b;hb=1e21ad9c93c0a0a457c1875d5c8d744173f0b9d0;hp=6beb50927a63dca8b26fdd3e997d49154ece46c5;hpb=7bbe971aec2d548de981a12ed08a7b56a536dcdb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 6beb50927a..0fb97c6e57 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -2,9 +2,9 @@
 /*
  * Script to clean up broken, unparseable titles.
  *
- * Usage: php cleanupTitles.php [--dry-run]
+ * Usage: php cleanupTitles.php [--fix]
  * Options:
- *   --dry-run  don't actually try moving them
+ *   --fix  Actually clean up titles; otherwise just checks for them
  *
  * Copyright (C) 2005 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
@@ -21,112 +21,44 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @author Brion Vibber <brion at pobox.com>
- * @package MediaWiki
- * @subpackage maintenance
+ * @addtogroup maintenance
  */
 
-$options = array( 'dry-run' );
-
 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() {
-		$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();
+class TitleCleanup extends TableCleanup {
+	function __construct( $dryrun = false ) {
+		parent::__construct( 'page', $dryrun );
 	}
-	
-	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 );
-	}
-	
+
 	function processPage( $row ) {
-		global $wgContLang;
-		
 		$current = Title::makeTitle( $row->page_namespace, $row->page_title );
 		$display = $current->getPrefixedText();
-		
+
 		$verified = UtfNormal::cleanUp( $display );
-		
+
 		$title = Title::newFromText( $verified );
-		
+
 		if( is_null( $title ) ) {
 			$this->log( "page $row->page_id ($display) is illegal." );
 			$this->moveIllegalPage( $row );
 			return $this->progress( 1 );
 		}
-		
+
 		if( !$title->equals( $current ) ) {
 			$this->log( "page $row->page_id ($display) doesn't match self." );
 			$this->moveInconsistentPage( $row, $title );
 			return $this->progress( 1 );
 		}
-		
+
 		$this->progress( 0 );
 	}
-	
+
 	function moveIllegalPage( $row ) {
 		$legal = 'A-Za-z0-9_/\\\\-';
 		$legalized = preg_replace_callback( "!([^$legal])!",
@@ -135,7 +67,7 @@ class TitleCleanup extends FiveUpgrade {
 		if( $legalized == '.' ) $legalized = '(dot)';
 		if( $legalized == '_' ) $legalized = '(space)';
 		$legalized = 'Broken/' . $legalized;
-		
+
 		$title = Title::newFromText( $legalized );
 		if( is_null( $title ) ) {
 			$clean = 'Broken/id:' . $row->page_id;
@@ -146,20 +78,20 @@ class TitleCleanup extends FiveUpgrade {
 			$this->log( "Legalized for '$legalized' exists; using '$clean'" );
 			$title = Title::newFromText( $clean );
 		}
-		
+
 		$dest = $title->getDbKey();
 		if( $this->dryrun ) {
 			$this->log( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
 		} else {
 			$this->log( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
-			$dbw =& wfGetDB( DB_MASTER );
+			$dbw = wfGetDB( DB_MASTER );
 			$dbw->update( 'page',
 				array( 'page_title' => $dest ),
 				array( 'page_id' => $row->page_id ),
 				'cleanupTitles::moveInconsistentPage' );
 		}
 	}
-	
+
 	function moveInconsistentPage( $row, $title ) {
 		if( $title->exists() || $title->getInterwiki() ) {
 			if( $title->getInterwiki() ) {
@@ -177,7 +109,7 @@ class TitleCleanup extends FiveUpgrade {
 			$title = $verified;
 		}
 		if( is_null( $title ) ) {
-			die( "Something awry; empty title.\n" );
+			wfDie( "Something awry; empty title.\n" );
 		}
 		$ns = $title->getNamespace();
 		$dest = $title->getDbKey();
@@ -185,7 +117,7 @@ class TitleCleanup extends FiveUpgrade {
 			$this->log( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
 		} else {
 			$this->log( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($ns,'$dest')" );
-			$dbw =& wfGetDB( DB_MASTER );
+			$dbw = wfGetDB( DB_MASTER );
 			$dbw->update( 'page',
 				array(
 					'page_namespace' => $ns,
@@ -197,14 +129,10 @@ class TitleCleanup extends FiveUpgrade {
 			$linkCache->clear();
 		}
 	}
-	
-	function hexChar( $matches ) {
-		return sprintf( "\\x%02x", ord( $matches[1] ) );
-	}
 }
 
 $wgUser->setName( 'Conversion script' );
-$caps = new TitleCleanup( isset( $options['dry-run'] ) );
+$caps = new TitleCleanup( !isset( $options['fix'] ) );
 $caps->cleanup();
 
 ?>