Follow-up r62648: Add new message key to maintenance script

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

diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php
index 3b704eb..e681845 100644 (file)
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -3,11 +3,26 @@
  * Maintenance script to provide a better count of the number of articles
  * and update the site statistics table, if desired
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class UpdateArticleCount extends Maintenance {
 
@@ -15,20 +30,20 @@ class UpdateArticleCount extends Maintenance {
        private $namespaces;
 
        public function __construct() {
-               global $wgContentNamespaces;
                parent::__construct();
                $this->mDescription = "Count of the number of articles and update the site statistics table";
-               $this->addParam( 'update', 'Update the site_stats table with the new count' );
-               $this->namespaces = $wgContentNamespaces;
+               $this->addOption( 'update', 'Update the site_stats table with the new count' );
        }
 
        public function execute() {
+               global $wgContentNamespaces;
+               $this->namespaces = $wgContentNamespaces;
                $this->output( "Counting articles..." );
                $result = $this->count();
        
                if( $result !== false ) {
                        $this->output( "found {$result}.\n" );
-                       if( isset( $options['update'] ) && $options['update'] ) {
+                       if( $this->hasOption( 'update' ) ) {
                                $this->output( "Updating site statistics table... " );
                                $dbw = wfGetDB( DB_MASTER );
                                $dbw->update( 'site_stats', array( 'ss_good_articles' => $result ), array( 'ss_row_id' => 1 ), __METHOD__ );
@@ -62,7 +77,7 @@ class UpdateArticleCount extends Maintenance {
        private function makeSql( $dbr ) {
                list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
                $nsset = $this->makeNsSet();
-               return "SELECT COUNT(DISTINCT page_namespace, page_title) AS pagecount " .
+               return "SELECT COUNT(DISTINCT page_id) AS pagecount " .
                        "FROM $page, $pagelinks " .
                        "WHERE pl_from=page_id and page_namespace IN ( $nsset ) " .
                        "AND page_is_redirect = 0 AND page_len > 0";
@@ -78,7 +93,7 @@ class UpdateArticleCount extends Maintenance {
                $res = $dbr->query( $this->makeSql( $dbr ), __METHOD__ );
                $row = $dbr->fetchObject( $res );
                $dbr->freeResult( $res );
-               return $row->pagecount;
+               return $row ? $row->pagecount : false;
        }
 }