1 files changed, 67 insertions, 44 deletions

diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php
index c84d8aa5..95404244 100644
--- a/maintenance/storage/dumpRev.php
+++ b/maintenance/storage/dumpRev.php
@@ -1,56 +1,79 @@
 <?php
 /**
- * @file
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance ExternalStorage
  */
 
-require_once( dirname(__FILE__) . '/../commandLine.inc' );
+require_once( dirname(__FILE__) . '/../Maintenance.php' );
 
-$wgDebugLogFile = '/dev/stdout';
-
-
-$dbr = wfGetDB( DB_SLAVE );
-$row = $dbr->selectRow( 
-	array( 'text', 'revision' ), 
-	array( 'old_flags', 'old_text' ), 
-	array( 'old_id=rev_text_id', 'rev_id' => $args[0] )
-);
-if ( !$row ) {
-	print "Row not found\n";
-	exit;
-}
+class DumpRev extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->addArg( 'rev-id', 'Revision ID', true );
+	}
 
-$flags = explode( ',',  $row->old_flags );
-$text = $row->old_text;
-if ( in_array( 'external', $flags ) ) {
-	print "External $text\n";
-	if ( preg_match( '!^DB://(\w+)/(\w+)/(\w+)$!', $text, $m ) ) {
-		$es = ExternalStore::getStoreObject( 'DB' );
-		$blob = $es->fetchBlob( $m[1], $m[2], $m[3] );
-		if ( strtolower( get_class( $blob ) ) == 'concatenatedgziphistoryblob' ) {
-			print "Found external CGZ\n";
-			$blob->uncompress();
-			print "Items: (" . implode( ', ', array_keys( $blob->mItems ) ) . ")\n";
-			$text = $blob->getItem( $m[3] );
+	public function execute() {
+		$dbr = wfGetDB( DB_SLAVE );
+		$row = $dbr->selectRow( 
+			array( 'text', 'revision' ), 
+			array( 'old_flags', 'old_text' ), 
+			array( 'old_id=rev_text_id', 'rev_id' => $this->getArg() )
+		);
+		if ( !$row ) {
+			$this->error( "Row not found", true );
+		}
+	
+		$flags = explode( ',',  $row->old_flags );
+		$text = $row->old_text;
+		if ( in_array( 'external', $flags ) ) {
+			$this->output( "External $text\n" );
+			if ( preg_match( '!^DB://(\w+)/(\w+)/(\w+)$!', $text, $m ) ) {
+				$es = ExternalStore::getStoreObject( 'DB' );
+				$blob = $es->fetchBlob( $m[1], $m[2], $m[3] );
+				if ( strtolower( get_class( $blob ) ) == 'concatenatedgziphistoryblob' ) {
+					$this->output( "Found external CGZ\n" );
+					$blob->uncompress();
+					$this->output( "Items: (" . implode( ', ', array_keys( $blob->mItems ) ) . ")\n" );
+					$text = $blob->getItem( $m[3] );
+				} else {
+					$this->output( "CGZ expected at $text, got " . gettype( $blob ) . "\n" );
+					$text = $blob;
+				}
+			} else {
+				$this->output( "External plain $text\n" );
+				$text = ExternalStore::fetchFromURL( $text );
+			}
+		}
+		if ( in_array( 'gzip', $flags ) ) {
+			$text = gzinflate( $text );
+		}
+		if ( in_array( 'object', $flags ) ) {
+			$obj = unserialize( $text );
+			$text = $obj->getText();
+		}
+	
+		if ( is_object( $text ) ) {
+			$this->error( "Unexpectedly got object of type: " . get_class( $text ) );
 		} else {
-			print "CGZ expected at $text, got " . gettype( $blob ) . "\n";
-			$text = $blob;
+			$this->output( "Text length: " . strlen( $text ) ."\n" );
+			$this->output( substr( $text, 0, 100 ) . "\n" );
 		}
-	} else {
-		print "External plain $text\n";
-		$text = ExternalStore::fetchFromURL( $text );
 	}
 }
-if ( in_array( 'gzip', $flags ) ) {
-	$text = gzinflate( $text );
-}
-if ( in_array( 'object', $flags ) ) {
-	$text = unserialize( $text );
-}
 
-if ( is_object( $text ) ) {
-	print "Unexpectedly got object of type: " . get_class( $text ) .  "\n";
-} else {
-	print "Text length: " . strlen( $text ) ."\n";
-	print substr( $text, 0, 100 ) . "\n";
-}
+$maintClass = "DumpRev";
+require_once( DO_MAINTENANCE );