From 8241670132edf99e105ff133fcfb4f415955aecb Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 26 May 2012 13:27:38 -0700 Subject: [PATCH] Handle more ES exceptions when getting text. Change-Id: I795dce37bcf4a24d5922d2d5166bf27ba9b77607 --- maintenance/populateRevisionSha1.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php index d8ff74906c..1d8e4c8ba6 100644 --- a/maintenance/populateRevisionSha1.php +++ b/maintenance/populateRevisionSha1.php @@ -132,12 +132,15 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance { */ protected function upgradeRow( $row, $table, $idCol, $prefix ) { $db = $this->getDB( DB_MASTER ); - if ( $table === 'archive' ) { - $rev = Revision::newFromArchiveRow( $row ); - } else { - $rev = new Revision( $row ); + try { + $rev = ( $table === 'archive' ) + ? Revision::newFromArchiveRow( $row ) + : new Revision( $row ); + $text = $rev->getRawText(); + } catch ( MWException $e ) { + $this->output( "Text of revision with {$idCol}={$row->$idCol} unavailable!\n" ); + return false; // bug 22624? } - $text = $rev->getRawText(); if ( !is_string( $text ) ) { # This should not happen, but sometimes does (bug 20757) $this->output( "Text of revision with {$idCol}={$row->$idCol} unavailable!\n" ); @@ -161,6 +164,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance { try { $rev = Revision::newFromArchiveRow( $row ); } catch ( MWException $e ) { + $this->output( "Text of revision with timestamp {$row->ar_timestamp} unavailable!\n" ); return false; // bug 22624? } $text = $rev->getRawText(); -- 2.20.1