X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FdeleteOldRevisions.php;h=6a3e211b00bee876368eaca88dd3b7f5e7c59080;hb=e34865144f3f21bb8b0ad4ba76d3d10490a73462;hp=7084751859d0116ca6dd58c1fdf90278de2aa22f;hpb=a1c51e18af85a9ac464c5b555921e58ec422cd11;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php
index 7084751859..6a3e211b00 100644
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Delete old (non-current) revisions from the database
  *
@@ -18,39 +17,43 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( "Maintenance.php" );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that deletes old (non-current) revisions from the database.
+ *
+ * @ingroup Maintenance
+ */
 class DeleteOldRevisions extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Delete old (non-current) revisions from the database";
 		$this->addOption( 'delete', 'Actually perform the deletion' );
+		$this->addOption( 'page_id', 'List of page ids to work on', false );
 	}
-	
+
 	public function execute() {
 		$this->output( "Delete old revisions\n\n" );
-		if( count( $this->mArgs ) < 1 ) {
-			$this->error( "Must pass at least 1 page_id", true );
-		}
 		$this->doDelete( $this->hasOption( 'delete' ), $this->mArgs );
 	}
-	
+
 	function doDelete( $delete = false, $args = array() ) {
 
 		# Data should come off the master, wrapped in a transaction
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
-	
+		$dbw->begin( __METHOD__ );
+
 		$tbl_pag = $dbw->tableName( 'page' );
 		$tbl_rev = $dbw->tableName( 'revision' );
-	
+
 		$pageIdClause = '';
 		$revPageClause = '';
-	
+
 		# If a list of page_ids was provided, limit results to that set of page_ids
 		if ( sizeof( $args ) > 0 ) {
 			$pageIdList = implode( ',', $args );
@@ -58,45 +61,47 @@ class DeleteOldRevisions extends Maintenance {
 			$revPageClause = " AND rev_page IN ({$pageIdList})";
 			$this->output( "Limiting to {$tbl_pag}.page_id IN ({$pageIdList})\n" );
 		}
-	
+
 		# Get "active" revisions from the page table
 		$this->output( "Searching for active revisions..." );
 		$res = $dbw->query( "SELECT page_latest FROM $tbl_pag{$pageIdClause}" );
-		while( $row = $dbw->fetchObject( $res ) ) {
+		$cur = array();
+		foreach ( $res as $row ) {
 			$cur[] = $row->page_latest;
 		}
 		$this->output( "done.\n" );
-	
+
 		# Get all revisions that aren't in this set
+		$old = array();
 		$this->output( "Searching for inactive revisions..." );
 		$set = implode( ', ', $cur );
 		$res = $dbw->query( "SELECT rev_id FROM $tbl_rev WHERE rev_id NOT IN ( $set ){$revPageClause}" );
-		while( $row = $dbw->fetchObject( $res ) ) {
+		foreach ( $res as $row ) {
 			$old[] = $row->rev_id;
 		}
 		$this->output( "done.\n" );
-	
+
 		# Inform the user of what we're going to do
 		$count = count( $old );
 		$this->output( "$count old revisions found.\n" );
-	
+
 		# Delete as appropriate
-		if( $delete && $count ) {
+		if ( $delete && $count ) {
 			$this->output( "Deleting..." );
 			$set = implode( ', ', $old );
 			$dbw->query( "DELETE FROM $tbl_rev WHERE rev_id IN ( $set )" );
 			$this->output( "done.\n" );
 		}
-	
+
 		# This bit's done
 		# Purge redundant text records
-		$dbw->commit();
-		if( $delete ) {
+		$dbw->commit( __METHOD__ );
+		if ( $delete ) {
 			$this->purgeRedundantText( true );
 		}
 	}
 }
 
 $maintClass = "DeleteOldRevisions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );