diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2007-09-14 13:18:58 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2007-09-14 13:18:58 +0200 |
commit | 8f416baead93a48e5799e44b8bd2e2c4859f4e04 (patch) | |
tree | cd47ac55eb80a39e3225e8b4f3161b88ea16c2cf /maintenance/dumpTextPass.php | |
parent | d7d08bd1a17618c7d77a6b9b2989e9f7293d6ed6 (diff) |
auf Version 1.11 aktualisiert; Login-Bug behoben
Diffstat (limited to 'maintenance/dumpTextPass.php')
-rw-r--r-- | maintenance/dumpTextPass.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 494c5ad4..92ab4b4e 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -24,8 +24,7 @@ $originalDir = getcwd(); require_once( 'commandLine.inc' ); -require_once( 'SpecialExport.php' ); -require_once( 'maintenance/backup.inc' ); +require_once( 'backup.inc' ); /** * Stream wrapper around 7za filter program. @@ -240,17 +239,23 @@ class TextPassDumper extends BackupDumper { } while( true ) { try { - return $this->doGetText( $id ); + $text = $this->doGetText( $id ); + $ex = new MWException("Graceful storage failure"); } catch (DBQueryError $ex) { + $text = false; + } + if( $text === false ) { $this->failures++; if( $this->failures > $this->maxFailures ) { throw $ex; } else { $this->progress( "Database failure $this->failures " . - "of allowed $this->maxFailures! " . + "of allowed $this->maxFailures for revision $id! " . "Pausing $this->failureTimeout seconds..." ); sleep( $this->failureTimeout ); } + } else { + return $text; } } } @@ -265,6 +270,9 @@ class TextPassDumper extends BackupDumper { array( 'old_id' => $id ), 'TextPassDumper::getText' ); $text = Revision::getRevisionText( $row ); + if( $text === false ) { + return false; + } $stripped = str_replace( "\r", "", $text ); $normalized = UtfNormal::cleanUp( $stripped ); return $normalized; @@ -367,4 +375,4 @@ END ); } -?> + |