X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/mediawiki.git/blobdiff_plain/19e297c21b10b1b8a3acad5e73fc71dcb35db44a..6932310fd58ebef145fa01eb76edf7150284d8ea:/maintenance/updateDoubleWidthSearch.php diff --git a/maintenance/updateDoubleWidthSearch.php b/maintenance/updateDoubleWidthSearch.php index bfbc441f..cb2f125e 100644 --- a/maintenance/updateDoubleWidthSearch.php +++ b/maintenance/updateDoubleWidthSearch.php @@ -1,6 +1,6 @@ mDescription = "Script to normalize double-byte latin UTF-8 characters"; + $this->addDescription( 'Script to normalize double-byte latin UTF-8 characters' ); $this->addOption( 'q', 'quiet', false, true ); - $this->addOption( 'l', 'How long the searchindex and revision tables will be locked for', false, true ); + $this->addOption( + 'l', + 'How long the searchindex and revision tables will be locked for', + false, + true + ); } public function getDbType() { @@ -41,14 +51,13 @@ class UpdateDoubleWidthSearch extends Maintenance { public function execute() { $maxLockTime = $this->getOption( 'l', 20 ); - $dbw = wfGetDB( DB_MASTER ); + $dbw = $this->getDB( DB_MASTER ); if ( $dbw->getType() !== 'mysql' ) { - $this->output( "This change is only needed on MySQL, quitting.\n" ); - exit( 1 ); + $this->error( "This change is only needed on MySQL, quitting.\n", true ); } $res = $this->findRows( $dbw ); - $this->updateSearchIndex( $maxLockTime, array( $this, 'searchIndexUpdateCallback' ), $dbw, $res ); + $this->updateSearchIndex( $maxLockTime, [ $this, 'searchIndexUpdateCallback' ], $dbw, $res ); $this->output( "Done\n" ); } @@ -63,9 +72,10 @@ class UpdateDoubleWidthSearch extends Maintenance { $sql = "SELECT si_page FROM $searchindex WHERE ( si_text RLIKE '$regexp' ) OR ( si_title RLIKE '$regexp' )"; + return $dbw->query( $sql, __METHOD__ ); } } $maintClass = "UpdateDoubleWidthSearch"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN;