Merge "Remove "@author Aaron Schulz" annotations"

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

diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php
index 30883ba..905b5d9 100644 (file)
--- a/maintenance/deleteArchivedRevisions.php
+++ b/maintenance/deleteArchivedRevisions.php
@@ -21,11 +21,9 @@
  *
  * @file
  * @ingroup Maintenance
- * @author Aaron Schulz
  */
 
 require_once __DIR__ . '/Maintenance.php';
-require_once __DIR__ . '/deleteArchivedRevisions.inc';
 
 /**
  * Maintenance script to delete archived (deleted from public) revisions
@@ -36,26 +34,29 @@ require_once __DIR__ . '/deleteArchivedRevisions.inc';
 class DeleteArchivedRevisions extends Maintenance {
        public function __construct() {
                parent::__construct();
-               $this->mDescription =
-                       "Deletes all archived revisions\nThese revisions will no longer be restorable";
+               $this->addDescription(
+                       "Deletes all archived revisions\nThese revisions will no longer be restorable" );
                $this->addOption( 'delete', 'Performs the deletion' );
        }
 
-       public function handleOutput( $str ) {
-               $this->output( $str );
-       }
-
        public function execute() {
-               $this->output( "Delete archived revisions\n\n" );
-               # Data should come off the master, wrapped in a transaction
-               if ( $this->hasOption( 'delete' ) ) {
-                       DeleteArchivedRevisionsImplementation::doDelete( $this );
-               } else {
-                       $dbw = wfGetDB( DB_MASTER );
-                       $res = $dbw->selectRow( 'archive', 'COUNT(*) as count', array(), __FUNCTION__ );
-                       $this->output( "Found {$res->count} revisions to delete.\n" );
+               $dbw = $this->getDB( DB_MASTER );
+
+               if ( !$this->hasOption( 'delete' ) ) {
+                       $count = $dbw->selectField( 'archive', 'COUNT(*)', '', __METHOD__ );
+                       $this->output( "Found $count revisions to delete.\n" );
                        $this->output( "Please run the script again with the --delete option "
                                . "to really delete the revisions.\n" );
+                       return;
+               }
+
+               $this->output( "Deleting archived revisions... " );
+               $dbw->delete( 'archive', '*', __METHOD__ );
+               $count = $dbw->affectedRows();
+               $this->output( "done. $count revisions deleted.\n" );
+
+               if ( $count ) {
+                       $this->purgeRedundantText( true );
                }
        }
 }