X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FupdateArticleCount.php;h=dbbfb80c3f4a62789f811632a6c749f5ee46c529;hb=7b8c15565161d260772cf418be13320091543a29;hp=3b704ebf981d6c86ec95660eba4983567a97fbee;hpb=59b60fc31194b3b09bba2c95b8ddf85c3f9e81bb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php
index 3b704ebf98..dbbfb80c3f 100644
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -3,84 +3,53 @@
  * 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
+ *
+ * @file
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class UpdateArticleCount extends Maintenance {
 
-	// Content namespaces
-	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() {
 		$this->output( "Counting articles..." );
-		$result = $this->count();
-	
-		if( $result !== false ) {
-			$this->output( "found {$result}.\n" );
-			if( isset( $options['update'] ) && $options['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__ );
-				$this->output( "done.\n" );
-			} else {
-				$this->output( "To update the site statistics table, run the script with the --update option.\n" );
-			}
-		} else {
-			$this->output( "failed.\n" );
-		}
-	}
-
-	/**
-	 * Produce a comma-delimited set of namespaces
-	 * Includes paranoia
-	 *
-	 * @return string
-	 */
-	private function makeNsSet() {
-		foreach( $this->namespaces as $namespace )
-			$namespaces[] = intval( $namespace );
-		return implode( ', ', $namespaces );
-	}
 
-	/**
-	 * Produce SQL for the query
-	 *
-	 * @param $dbr Database handle
-	 * @return string
-	 */
-	private function makeSql( $dbr ) {
-		list( $page, $pagelinks ) = $dbr->tableNamesN( 'page', 'pagelinks' );
-		$nsset = $this->makeNsSet();
-		return "SELECT COUNT(DISTINCT page_namespace, page_title) AS pagecount " .
-			"FROM $page, $pagelinks " .
-			"WHERE pl_from=page_id and page_namespace IN ( $nsset ) " .
-			"AND page_is_redirect = 0 AND page_len > 0";
-	}
+		$counter = new SiteStatsInit( false );
+		$result = $counter->articles();
 
-	/**
-	 * Count the number of valid content pages in the wiki
-	 *
-	 * @return mixed Integer, or false if there's a problem
-	 */
-	private function count() {
-		$dbr = wfGetDB( DB_SLAVE );
-		$res = $dbr->query( $this->makeSql( $dbr ), __METHOD__ );
-		$row = $dbr->fetchObject( $res );
-		$dbr->freeResult( $res );
-		return $row->pagecount;
+		$this->output( "found {$result}.\n" );
+		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__ );
+			$this->output( "done.\n" );
+		} else {
+			$this->output( "To update the site statistics table, run the script with the --update option.\n" );
+		}
 	}
 }
 
 $maintClass = "UpdateArticleCount";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );