Move up to date the parser test expectation.

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

diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php
index 61bec78..d258287 100644 (file)
--- a/maintenance/fixTimestamps.php
+++ b/maintenance/fixTimestamps.php
@@ -24,21 +24,23 @@
  * @ingroup Maintenance
  */
  
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class FixTimestamps extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "";
-               $this->addArgs( array( 'offset', 'start', 'end' ) );
+               $this->addArg( 'offset', '' );
+               $this->addArg( 'start', 'Starting timestamp' );
+               $this->addArg( 'end', 'Ending timestamp' );
        }
 
        public function execute() {
-               $offset = $this->getArg(0) * 3600;
-               $start = $this->getArg(1);
-               $end = $this->getArg(2);
+               $offset = $this->getArg( 0 ) * 3600;
+               $start = $this->getArg( 1 );
+               $end = $this->getArg( 2 );
                $grace = 60; // maximum normal clock offset
-       
+
                # Find bounding revision IDs
                $dbw = wfGetDB( DB_MASTER );
                $revisionTable = $dbw->tableName( 'revision' );
@@ -47,7 +49,7 @@ class FixTimestamps extends Maintenance {
                $row = $dbw->fetchObject( $res );
        
                if ( is_null( $row->minrev ) ) {
-                       $this->error( "No revisions in search period.\n", true );
+                       $this->error( "No revisions in search period.", true );
                }
        
                $minRev = $row->minrev;
@@ -69,7 +71,7 @@ class FixTimestamps extends Maintenance {
                $badRevs = array();
                $numGoodRevs = 0;
        
-               while ( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $timestamp = wfTimestamp( TS_UNIX, $row->rev_timestamp );
                        $delta = $timestamp - $lastNormal;
                        $sign = $delta == 0 ? 0 : $delta / abs( $delta );
@@ -91,22 +93,21 @@ class FixTimestamps extends Maintenance {
        
                $numBadRevs = count( $badRevs );
                if ( $numBadRevs > $numGoodRevs ) {
-                       $this->error( 
+                       $this->error(
                "The majority of revisions in the search interval are marked as bad.
 
                Are you sure the offset ($offset) has the right sign? Positive means the clock 
                was incorrectly set forward, negative means the clock was incorrectly set back.
 
                If the offset is right, then increase the search interval until there are enough 
-               good revisions to provide a majority reference.
-               ", true );
+               good revisions to provide a majority reference.", true );
                } elseif ( $numBadRevs == 0 ) {
                        $this->output( "No bad revisions found.\n" );
-                       exit(0);
+                       exit( 0 );
                }
        
-               $this->output( sprintf( "Fixing %d revisions (%.2f%% of revisions in search interval)\n", 
-                       $numBadRevs, $numBadRevs / ($numGoodRevs + $numBadRevs) * 100 ) );
+               $this->output( sprintf( "Fixing %d revisions (%.2f%% of revisions in search interval)\n",
+                       $numBadRevs, $numBadRevs / ( $numGoodRevs + $numBadRevs ) * 100 ) );
        
                $fixup = -$offset;
                $sql = "UPDATE $revisionTable " .