tableName calls moved inside fieldInfoMulti and removed call that existed only for...

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

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 0e07c32..bd4ef7b 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -33,7 +33,7 @@
  * 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() {
@@ -42,7 +42,7 @@ class MoveBatch extends Maintenance {
                $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->addArgs( array( 'listfile' ) );
+               $this->addArg( 'listfile', 'List of pages to move, newline delimited', false );
        }
        
        public function execute() {
@@ -64,7 +64,7 @@ class MoveBatch extends Maintenance {
 
                # Setup
                if( !$file ) {
-                       $this->error( "Unable to read file, exiting\n", true );
+                       $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
                
@@ -77,13 +77,13 @@ 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;
                        }
        
@@ -94,7 +94,7 @@ class MoveBatch extends Maintenance {
                        if( $err !== true ) {
                                $this->output( "\nFAILED: $err" );
                        }
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                        $this->output( "\n" );
        
                        if ( $interval ) {