Rewrite importUseModWiki to subclass maintenance, general cleanup, etc. Also fixing...

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

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 13dd40a..9b9f910 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -2,6 +2,21 @@
 /**
  * Maintenance script to move a batch of pages
  *
+ * 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
  * @author Tim Starling
  *
@@ -18,18 +33,18 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class MoveBatch extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Moves a batch of pages";
-               $this->addParam( 'u', "User to perform move", false, true );
-               $this->addParam( 'r', "Reason to move page", false, true );
-               $this->addParam( 'i', "Interval to sleep between moves" );
-               $this->addArgs( array( 'listfile' ) );
+               $this->addOption( 'u', "User to perform move", false, true );
+               $this->addOption( 'r', "Reason to move page", false, true );
+               $this->addOption( 'i', "Interval to sleep between moves" );
+               $this->addArg( 'listfile', 'List of pages to move, newline delimited', false );
        }
-       
+
        public function execute() {
                global $wgUser;
 
@@ -41,18 +56,18 @@ class MoveBatch extends Maintenance {
                $user = $this->getOption( 'u', 'Move page script' );
                $reason = $this->getOption( 'r', '' );
                $interval = $this->getOption( 'i', 0 );
-               if( $this->hasArg() ) {
+               if ( $this->hasArg() ) {
                        $file = fopen( $this->getArg(), 'r' );
                } else {
                        $file = $this->getStdin();
                }
 
                # Setup
-               if( !$file ) {
-                       $this->error( "Unable to read file, exiting\n", true );
+               if ( !$file ) {
+                       $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
-               
+
                # Setup complete, now start
                $dbw = wfGetDB( DB_MASTER );
                for ( $linenum = 1; !feof( $file ); $linenum++ ) {
@@ -62,33 +77,34 @@ class MoveBatch extends Maintenance {
                        }
                        $parts = array_map( 'trim', explode( '|', $line ) );
                        if ( count( $parts ) != 2 ) {
-                               $this->error( "Error on line $linenum, no pipe character\n" );
+                               $this->error( "Error on line $linenum, no pipe character" );
                                continue;
                        }
                        $source = Title::newFromText( $parts[0] );
                        $dest = Title::newFromText( $parts[1] );
                        if ( is_null( $source ) || is_null( $dest ) ) {
-                               $this->error( "Invalid title on line $linenum\n" );
+                               $this->error( "Invalid title on line $linenum" );
                                continue;
                        }
-       
-       
+
+
                        $this->output( $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText() );
                        $dbw->begin();
                        $err = $source->moveTo( $dest, false, $reason );
-                       if( $err !== true ) {
-                               $this->output( "\nFAILED: $err" );
+                       if ( $err !== true ) {
+                               $msg = array_shift( $err[0] );
+                               $this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) );
                        }
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                        $this->output( "\n" );
-       
+
                        if ( $interval ) {
                                sleep( $interval );
                        }
-                       wfWaitForSlaves( 5 );
+                       wfWaitForSlaves();
                }
        }
 }
 
 $maintClass = "MoveBatch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );