No point in fetching the result in Database::unlock() if we're not using it anyway.

[lhc/web/wiklou.git] / maintenance / refreshLinks.inc

diff --git a/maintenance/refreshLinks.inc b/maintenance/refreshLinks.inc
index 34ea629..e52d101 100644 (file)
--- a/maintenance/refreshLinks.inc
+++ b/maintenance/refreshLinks.inc
@@ -1,38 +1,60 @@
 <?php
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @file
+ * @ingroup Maintenance
  */
 
 /** */
 define( "REPORTING_INTERVAL", 100 );
 #define( "REPORTING_INTERVAL", 1 );
 
-function refreshLinks( $start, $newOnly = false, $maxLag = false, $end = 0 ) {
-       global $wgUser, $wgParser, $wgUseImageResize, $wgUseTidy;
+function refreshLinks( $start, $newOnly = false, $maxLag = false, $end = 0, $redirectsOnly = false, $oldRedirectsOnly = false ) {
+       global $wgUser, $wgParser, $wgUseTidy;
 
        $fname = 'refreshLinks';
-       $dbr =& wfGetDB( DB_SLAVE );
+       $dbr = wfGetDB( DB_SLAVE );
        $start = intval( $start );
 
        # Don't generate TeX PNGs (lack of a sensible current directory causes errors anyway)
        $wgUser->setOption('math', MW_MATH_SOURCE);
 
        # Don't generate extension images (e.g. Timeline)
-       $wgParser->mTagHooks = array();
+       $wgParser->clearTagHooks();
 
-       # Don't generate thumbnail images
-       $wgUseImageResize = false;
+       # Don't use HTML tidy
        $wgUseTidy = false;
 
-       if ( $newOnly ) {
-               print "Refreshing links from ";
+       $what = $redirectsOnly ? "redirects" : "links";
+
+       if( $oldRedirectsOnly ) {
+               # This entire code path is cut-and-pasted from below.  Hurrah.
+               $res = $dbr->query(
+                       "SELECT page_id ".
+                       "FROM page ".
+                       "LEFT JOIN redirect ON page_id=rd_from ".
+                       "WHERE page_is_redirect=1 AND rd_from IS NULL AND ".
+                       ($end == 0 ? "page_id >= $start"
+                                  : "page_id BETWEEN $start AND $end"),
+                       $fname
+               );
+               $num = $dbr->numRows( $res );
+               print "Refreshing $num old redirects from $start...\n";
+
+               while( $row = $dbr->fetchObject( $res ) ) {
+                       if ( !( ++$i % REPORTING_INTERVAL ) ) {
+                               print "$i\n";
+                               wfWaitForSlaves( $maxLag );
+                       }
+                       fixRedirect( $row->page_id );
+               }
+       } elseif( $newOnly ) {
+               print "Refreshing $what from ";
                $res = $dbr->select( 'page',
                        array( 'page_id' ),
                        array(
                                'page_is_new' => 1,
-                               "page_id > $start" ),
+                               "page_id >= $start" ),
                        $fname
                );
                $num = $dbr->numRows( $res );
@@ -44,11 +66,13 @@ function refreshLinks( $start, $newOnly = false, $maxLag = false, $end = 0 ) {
                                print "$i\n";
                                wfWaitForSlaves( $maxLag );
                        }
-
-                       fixLinksFromArticle( $row->page_id );
+                       if($redirectsOnly)
+                               fixRedirect( $row->page_id );
+                       else
+                               fixLinksFromArticle( $row->page_id );
                }
        } else {
-               print "Refreshing link table.\n";
+               print "Refreshing $what table.\n";
                if ( !$end ) {
                        $end = $dbr->selectField( 'page', 'max(page_id)', false );
                }
@@ -60,16 +84,38 @@ function refreshLinks( $start, $newOnly = false, $maxLag = false, $end = 0 ) {
                                print "$id\n";
                                wfWaitForSlaves( $maxLag );
                        }
-                       fixLinksFromArticle( $id );
+                       if($redirectsOnly)
+                               fixRedirect( $id );
+                       else
+                               fixLinksFromArticle( $id );
                }
        }
 }
 
+function fixRedirect( $id ){
+       global $wgTitle, $wgArticle;
+
+       $wgTitle = Title::newFromID( $id );
+       $dbw = wfGetDB( DB_MASTER );
+
+       if ( is_null( $wgTitle ) ) {
+               return;
+       }
+       $wgArticle = new Article($wgTitle);
+
+       $rt = $wgArticle->followRedirect();
+
+       if($rt == false || !is_object($rt))
+               return;
+
+       $wgArticle->updateRedirectOn($dbw,$rt);
+}
+
 function fixLinksFromArticle( $id ) {
        global $wgTitle, $wgParser;
        
        $wgTitle = Title::newFromID( $id );
-       $dbw =& wfGetDB( DB_MASTER );
+       $dbw = wfGetDB( DB_MASTER );
 
        $linkCache =& LinkCache::singleton();
        $linkCache->clear();
@@ -96,7 +142,7 @@ function deleteLinksFromNonexistent( $maxLag = 0 ) {
 
        wfWaitForSlaves( $maxLag );
 
-       $dbw =& wfGetDB( DB_WRITE );
+       $dbw = wfGetDB( DB_MASTER );
 
        $linksTables = array(
                'pagelinks' => 'pl_from',