http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72305
Revision: 72305
Author: reedy
Date: 2010-09-03 19:11:18 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Some code/query updates per problems noticed on prototype
Modified Paths:
--------------
trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
Modified:
trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
2010-09-03 19:06:16 UTC (rev 72304)
+++ trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
2010-09-03 19:11:18 UTC (rev 72305)
@@ -105,24 +105,23 @@
if ( $params['userrating'] && $userRatedArticle ) {
$revid = isset( $params['revid'] ) ? $params['revid'] :
$ratings[$pageId]['revid'];
- $this->resetQueryParams();
+ $dbr = wfGetDb( DB_SLAVE );
- $this->addTables( 'revision' );
- $this->addFields( array( 'COUNT(rev_id) AS norevs',
'rev_page' ) );
+ $res = $dbr->selectField(
+ 'revision',
+ 'COUNT(*) AS norevs',
+ array(
+ 'rev_page' => $params['pageid'],
+ 'rev_id > ' . $revid
+ ),
+ __METHOD__
+ );
- $this->addWhereFld( 'rev_page', $params['pageid'] );
- $this->addWhere( 'rev_id > ' . $revid );
-
- $res = $this->select( __METHOD__ );
-
global $wgArticleAssessmentStaleCount;
- if ( $res ) {
- $noOfRevs = $res->fetchRow()->norevs;
- if ( $noOfRevs > $wgArticleAssessmentStaleCount
) {
- //it's stale!
- $ratings[$params['pageid']]['stale'] =
intval( $noOfRevs );
- }
+ if ( $res && (int)$res > $wgArticleAssessmentStaleCount
) {
+ //it's stale!
+ $ratings[$params['pageid']]['stale'] = intval(
$res );
}
}
@@ -187,7 +186,7 @@
return array(
'api.php?action=query&list=articleassessment',
'api.php?action=query&list=articleassessment&aapageid=1',
-
'api.php?action=query&list=articleassessment&aapageid=1&userrating',
+
'api.php?action=query&list=articleassessment&aapageid=1&aauserrating',
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
