From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 18 Apr 2011 16:43:20 +0000 (+0000)
Subject: * Use DatabaseBase::selectField() to build the query instead of throwing a raw query... 
X-Git-Tag: 1.31.0-rc.0~30734
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=165a5a14d880917e4059fd49f6f9ad3d1a052daf;p=lhc%2Fweb%2Fwiklou.git

* Use DatabaseBase::selectField() to build the query instead of throwing a raw query in DatabaseBase::query()
* Use MWNamespace::getContentNamespaces() instead of $wgContentNamespaces
---

diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php
index b0dceb58ae..1f5f72d1c1 100644
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -27,9 +27,6 @@ require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class UpdateArticleCount extends Maintenance {
 
-	// Content namespaces
-	private $namespaces;
-
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Count of the number of articles and update the site statistics table";
@@ -37,8 +34,6 @@ class UpdateArticleCount extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgContentNamespaces;
-		$this->namespaces = $wgContentNamespaces;
 		$this->output( "Counting articles..." );
 		$result = $this->count();
 
@@ -57,43 +52,23 @@ class UpdateArticleCount extends Maintenance {
 		}
 	}
 
-	/**
-	 * 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_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";
-	}
-
 	/**
 	 * 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 );
-		return $row ? $row->pagecount : false;
+		return wfGetDB( DB_SLAVE )->selectField(
+			array( 'page', 'pagelinks' ),
+			'COUNT(DISTINCT page_id)',
+			array(
+				'pl_from=page_id',
+				'page_namespace' => MWNamespace::getContentNamespaces(),
+				'page_is_redirect' => 0,
+				'page_len > 0',
+			),
+			__METHOD__
+		);
 	}
 }