MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / maintenance / updateSearchIndex.php

diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index 152ce1b6cd695a1c2ecd007773ef6b320aa9e679..978631018946cce53db9bf6b0edd89bfa596dc28 100644 (file)
--- a/maintenance/updateSearchIndex.php
+++ b/maintenance/updateSearchIndex.php
@@ -24,10 +24,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
- 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class UpdateSearchIndex extends Maintenance {
 
@@ -48,8 +49,8 @@ class UpdateSearchIndex extends Maintenance {
                $posFile = $this->getOption( 'p', 'searchUpdate.' . wfWikiId() . '.pos' );
                $end = $this->getOption( 'e', wfTimestampNow() );
                if ( $this->hasOption( 's' ) ) {
-                       $start = $this->getOption('s');
-               } elseif( is_readable( 'searchUpdate.pos' ) ) {
+                       $start = $this->getOption( 's' );
+               } elseif ( is_readable( 'searchUpdate.pos' ) ) {
                        # B/c to the old position file name which was hardcoded
                        # We can safely delete the file when we're done though.
                        $start = file_get_contents( 'searchUpdate.pos' );
@@ -61,13 +62,21 @@ class UpdateSearchIndex extends Maintenance {
                        }
                }
                $lockTime = $this->getOption( 'l', 20 );
-               
+
                $this->doUpdateSearchIndex( $start, $end, $lockTime );
-               $file = fopen( $posFile, 'w' );
-               fwrite( $file, $end );
-               fclose( $file );
+               if ( is_writable( dirname( realpath( $posFile ) ) ) ) {
+                       $file = fopen( $posFile, 'w' );
+                       if ( $file !== false ) {
+                               fwrite( $file, $end );
+                               fclose( $file );
+                       } else {
+                               $this->output( "*** Couldn't write to the $posFile!\n" );
+                       }
+               } else {
+                       $this->output( "*** Couldn't write to the $posFile!\n" );
+               }
        }
-       
+
        private function doUpdateSearchIndex( $start, $end, $maxLockTime ) {
                global $wgDisableSearchUpdate;
 
@@ -89,85 +98,25 @@ class UpdateSearchIndex extends Maintenance {
                  ";
                $res = $dbw->query( $sql, __METHOD__ );
 
+               $this->updateSearchIndex( $maxLockTime, array( $this, 'searchIndexUpdateCallback' ), $dbw, $res );
 
-               # Lock searchindex
-               if ( $maxLockTime ) {
-                       $this->output( "   --- Waiting for lock ---" );
-                       $this->lockSearchindex( $dbw );
-                       $lockTime = time();
-                       $this->output( "\n" );
-               }
-
-               # Loop through the results and do a search update
-               foreach ( $res as $row ) {
-                       # Allow reads to be processed
-                       if ( $maxLockTime && time() > $lockTime + $maxLockTime ) {
-                               $this->output( "    --- Relocking ---" );
-                               $this->relockSearchindex( $dbw );
-                               $lockTime = time();
-                               $this->output( "\n" );
-                       }
-                       if ( $row->rc_type == RC_LOG ) {
-                               continue;
-                       } elseif ( $row->rc_type == RC_MOVE || $row->rc_type == RC_MOVE_OVER_REDIRECT ) {
-                               # Rename searchindex entry
-                               $titleObj = Title::makeTitle( $row->rc_moved_to_ns, $row->rc_moved_to_title );
-                               $title = $titleObj->getPrefixedDBkey();
-                               $this->output( "$title..." );
-                               $u = new SearchUpdate( $row->rc_cur_id, $title, false );
-                               $this->output( "\n" );
-                       } else {
-                               // Get current revision
-                               $rev = Revision::loadFromPageId( $dbw, $row->rc_cur_id );
-                               if( $rev ) {
-                                       $titleObj = $rev->getTitle();
-                                       $title = $titleObj->getPrefixedDBkey();
-                                       $this->output( $title );
-                                       # Update searchindex
-                                       $u = new SearchUpdate( $row->rc_cur_id, $titleObj->getText(), $rev->getText() );
-                                       $u->doUpdate();
-                                       $this->output( "\n" );
-                               }
-                       }
-               }
-
-               # Unlock searchindex
-               if ( $maxLockTime ) {
-                       $this->output( "    --- Unlocking --" );
-                       $this->unlockSearchindex( $dbw );
-                       $this->output( "\n" );
-               }
                $this->output( "Done\n" );
        }
 
-       /**
-        * Lock the search index
-        * @param &$db Database object
-        */
-       private function lockSearchindex( &$db ) {
-               $write = array( 'searchindex' );
-               $read = array( 'page', 'revision', 'text', 'interwiki' );
-               $db->lockTables( $read, $write, 'updateSearchIndex.php ' . __METHOD__ );
-       }
-
-       /**
-        * Unlock the tables
-        * @param &$db Database object
-        */
-       private function unlockSearchindex( &$db ) {
-               $db->unlockTables( 'updateSearchIndex.php ' . __METHOD__ );
-       }
-       
-       /**
-        * Unlock and lock again
-        * Since the lock is low-priority, queued reads will be able to complete
-        * @param &$db Database object
-        */
-       private function relockSearchindex( &$db ) {
-               $this->unlockSearchindex( $db );
-               $this->lockSearchindex( $db );
+       public function searchIndexUpdateCallback( $dbw, $row ) {
+               if ( $row->rc_type == RC_MOVE || $row->rc_type == RC_MOVE_OVER_REDIRECT ) {
+                       # Rename searchindex entry
+                       $titleObj = Title::makeTitle( $row->rc_moved_to_ns, $row->rc_moved_to_title );
+                       $title = $titleObj->getPrefixedDBkey();
+                       $this->output( "$title..." );
+                       $u = new SearchUpdate( $row->rc_cur_id, $title, false );
+                       $u->doUpdate();
+                       $this->output( "\n" );
+               } elseif ( $row->rc_type !== RC_LOG ) {
+                       $this->updateSearchIndexForPage( $dbw, $row->rc_cur_id );
+               }
        }
 }
 
 $maintClass = "UpdateSearchIndex";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );