Fixed user scripts/styles and site scripts/styles - they were totally broken in r7277...

[lhc/web/wiklou.git] / maintenance / updateSearchIndex.php

diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index 7d4656b..6f8cb6e 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' );
@@ -63,17 +64,16 @@ class UpdateSearchIndex extends Maintenance {
                $lockTime = $this->getOption( 'l', 20 );
                
                $this->doUpdateSearchIndex( $start, $end, $lockTime );
-               if( is_writable( dirname( realpath( $posFile ) ) ) ) {
+               if ( is_writable( dirname( realpath( $posFile ) ) ) ) {
                        $file = fopen( $posFile, 'w' );
-                       if( $file !== false ) {
+                       if ( $file !== false ) {
                                fwrite( $file, $end );
                                fclose( $file );
                        } else {
-                       echo posix_get_last_error();
-                               $this->output( "*** Couldn't write to the $posFile!" );
+                               $this->output( "*** Couldn't write to the $posFile!\n" );
                        }
                } else {
-                       $this->output( "*** Couldn't write to the $posFile!" );
+                       $this->output( "*** Couldn't write to the $posFile!\n" );
                }
        }
        
@@ -98,18 +98,19 @@ class UpdateSearchIndex extends Maintenance {
                  ";
                $res = $dbw->query( $sql, __METHOD__ );
 
-               $this->updateSearchIndex($maxLockTime, array($this, 'searchIndexUpdateCallback'), $dbw, $res);
+               $this->updateSearchIndex( $maxLockTime, array( $this, 'searchIndexUpdateCallback' ), $dbw, $res );
 
                $this->output( "Done\n" );
        }
 
-       public function searchIndexUpdateCallback($dbw, $row) {
+       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 );