http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71777
Revision: 71777
Author: reedy
Date: 2010-08-27 00:56:55 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
prefix of columns should match table name...
Fixup where, and display usage
Fixup the r1, r2 elements etc from r71531
Modified Paths:
--------------
trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
Modified: trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
2010-08-27 00:53:22 UTC (rev 71776)
+++ trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
2010-08-27 00:56:55 UTC (rev 71777)
@@ -1,7 +1,7 @@
-- Store mapping of i18n key of "rating" to an ID
CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/article_assessment_ratings (
- aam_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
- aam_rating varchar(255) binary NOT NULL
+ aar_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ aar_rating varchar(255) binary NOT NULL
) /*$wgDBTableOptions*/;
-- INSERT INTO /*$wgDBprefix*/article_assessment_ratings(aam_rating)
VALUES('articleassessment-rating-wellsourced'),
Modified:
trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
2010-08-27 00:53:22 UTC (rev 71776)
+++ trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
2010-08-27 00:56:55 UTC (rev 71777)
@@ -18,9 +18,9 @@
$this->addTables( 'article_assessment_pages' );
$this->addTables( 'article_assessment_ratings' );
- $this->addFields( array( 'aap_page_id', 'aap_total',
'aap_count', 'aap_rating_id', 'aam_rating' ) );
+ $this->addFields( array( 'aap_page_id', 'aap_total',
'aap_count', 'aap_rating_id', 'aar_rating' ) );
- $this->addWhereFld( 'aap_rating_id', 'aam_rating_id' );
+ $this->addWhere( 'aap_rating_id = aar_id' );
if ( isset( $params['pageid'] ) ) {
$this->addWhereFld( 'aap_page_id', $params['pageid'] );
@@ -37,15 +37,16 @@
);
}
- $assessments[$row->aap_page_id]['ratings']['r' .
$row->aap_rating] = array(
+
$assessments[$row->aap_page_id]['ratings'][$row->aap_rating_id] = array(
'ratingid' => $row->aap_rating_id,
- 'ratingdesc' => $row->aam_rating,
+ 'ratingdesc' => $row->aar_rating,
'total' => $row->aap_total,
'count' => $row->aap_count
);
}
foreach ( $assessments as $ass ) {
+ $result->setIndexedTagName( $ass['ratings'], 'r' );
$result->addValue( array( 'query',
$this->getModuleName() ), null, $ass );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
