http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95290
Revision: 95290
Author: ariel
Date: 2011-08-23 00:36:15 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
fix timestamp stuff, more fallout from bad merge attempt
Modified Paths:
--------------
trunk/phase3/maintenance/dumpTextPass.php
Modified: trunk/phase3/maintenance/dumpTextPass.php
===================================================================
--- trunk/phase3/maintenance/dumpTextPass.php 2011-08-23 00:11:13 UTC (rev
95289)
+++ trunk/phase3/maintenance/dumpTextPass.php 2011-08-23 00:36:15 UTC (rev
95290)
@@ -181,6 +181,7 @@
if ( $this->reporting ) {
$now = wfTimestamp( TS_DB );
+ $nowts = wfTime();
$deltaAll = wfTime() - $this->startTime;
$deltaPart = wfTime() - $this->lastTime;
$this->pageCountPart = $this->pageCount -
$this->pageCountLast;
@@ -221,7 +222,7 @@
}
$this->progress( sprintf( "%s: %s (ID %d) %d pages
(%0.1f|%0.1f/sec all|curr), %d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%%
prefetched (all|curr), ETA %s [max %d]",-
$now, wfWikiID(), $this->ID,
$this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate,
$revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) );
- $this->lastTime = $now;
+ $this->lastTime = $nowts;
$this->revCountLast = $this->revCount;
$this->prefetchCountLast = $this->prefetchCount;
$this->fetchCountLast = $this->fetchCount;
@@ -233,6 +234,10 @@
}
function checkIfTimeExceeded() {
+ $m1 = $this->maxTimeAllowed;
+ $m2 = $this->lastTime;
+ $m3 = $this->timeOfCheckpoint;
+ $m4 = $this->lastTime - $this->timeOfCheckpoint;
if ( $this->maxTimeAllowed && ( $this->lastTime -
$this->timeOfCheckpoint > $this->maxTimeAllowed ) ) {
return True;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
