Was it supposed to be a comma instead of dot? :)

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

diff --git a/maintenance/populateCategory.inc b/maintenance/populateCategory.inc
index 905706e..deca453 100644 (file)
--- a/maintenance/populateCategory.inc
+++ b/maintenance/populateCategory.inc
@@ -1,6 +1,7 @@
 <?php
 /**
- * @addtogroup Maintenance
+ * @file
+ * @ingroup Maintenance
  * @author Simetrical
  */
 
@@ -17,9 +18,9 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
                        __FUNCTION__
                );
                if( $row ) {
-                       echo "Category table already populated.  Use php ".
-                       "maintenace/populateCategory.php\n--force from the command line ".
-                       "to override.\n";
+                       wfOut( "Category table already populated.  Use php ".
+                       "maintenance/populateCategory.php\n--force from the command line ".
+                       "to override.\n" );
                        return true;
                }
        }
@@ -55,14 +56,14 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
                # Use the row to update the category count
                $cat = Category::newFromName( $name );
                if( !is_object( $cat ) ) {
-                       var_dump( $cat );
-                       throw new MWException( "The category named $name is not valid?!" );
+                       wfOut( "The category named $name is not valid?!\n" );
+               } else {
+                       $cat->refreshCounts();
                }
-               $cat->refreshCounts();
 
                ++$i;
                if( !($i % REPORTING_INTERVAL) ) {
-                       echo "$name\n";
+                       wfOut( "$name\n" );
                        wfWaitForSlaves( $maxlag );
                }
                usleep( $throttle*1000 );
@@ -75,26 +76,10 @@ function populateCategory( $begin, $maxlag, $throttle, $force ) {
                        'IGNORE'
                )
        ) {
-               echo "Category population complete.\n";
+               wfOut( "Category population complete.\n" );
                return true;
        } else {
-               echo "Could not insert category population row.\n";
+               wfOut( "Could not insert category population row.\n" );
                return false;
        }
 }
-
-function wfWaitForSlaves( $maxLag ) {
-       global $wgLoadBalancer;
-       if ( $maxLag ) {
-               list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-               while ( $lag > $maxLag ) {
-                       $name = @gethostbyaddr( $host );
-                       if ( $name !== false ) {
-                               $host = $name;
-                       }
-                       print "Waiting for $host (lagged $lag seconds)...\n";
-                       sleep($maxLag);
-                       list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
-               }
-       }
-}