https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113062
Revision: 113062
Author: emsmith
Date: 2012-03-05 18:54:09 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
bug 34090 - follow up to r110520 1. change index 2. default of null for
continueId 3. rating => yes_no in sql to avoid confusion
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql
trunk/extensions/ArticleFeedbackv5/sql/alter.sql
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-05 18:53:59 UTC (rev 113061)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-03-05 18:54:09 UTC (rev 113062)
@@ -79,7 +79,7 @@
public function fetchFeedback( $pageId, $filter = 'visible',
$filterValue = null, $sort = 'age', $sortOrder = 'desc',
- $limit = 25, $continue = null, $continueId ) {
+ $limit = 25, $continue = null, $continueId = null ) {
$dbr = wfGetDB( DB_SLAVE );
$ids = array();
$rows = array();
@@ -117,7 +117,7 @@
case 'rating':
# TODO: null ratings don't seem to show up at
all. Need to sort that one out.
$sortField = 'rating';
- $order = "rating $direction, af_id
$direction";
+ $order = "yes_no $direction, af_id
$direction";
$continueSql = "(rating.aa_response_boolean
$continueDirection ".intVal( $continue )
." OR (rating.aa_response_boolean = ".intVal(
$continue )
." AND af_id $continueDirection ".intval(
$continueId ).") )";
@@ -158,7 +158,7 @@
array(
'af_id',
'af_net_helpfulness',
- 'rating.aa_response_boolean AS rating'
+ 'rating.aa_response_boolean AS yes_no'
),
$where,
__METHOD__,
@@ -214,7 +214,7 @@
'af_is_deleted', 'af_oversight_count',
'af_revision_id',
'af_net_helpfulness', 'af_revision_id',
'page_latest', 'page_title', 'page_namespace',
- 'rating.aa_response_boolean AS rating',
+ 'rating.aa_response_boolean AS yes_no',
'af_hide_user_id',
'af_hide_timestamp',
'af_oversight_user_id',
Modified: trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql
===================================================================
--- trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql
2012-03-05 18:53:59 UTC (rev 113061)
+++ trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql
2012-03-05 18:54:09 UTC (rev 113062)
@@ -71,6 +71,7 @@
CREATE INDEX /*i*/article_feedback_timestamp ON /*_*/aft_article_feedback
(af_created);
CREATE INDEX /*i*/af_page_id ON /*_*/aft_article_feedback (af_page_id,
af_created);
CREATE INDEX /*i*/af_page_feedback_id ON /*_*/aft_article_feedback
(af_page_id, af_id);
+CREATE INDEX /*_*/af_net_helpfulness_af_id ON /*_*/aft_article_feedback
(af_net_helpfulness, af_id);
-- Allows for organizing fields into fieldsets, for reporting or rendering.
-- A group is just a name and an ID.
Modified: trunk/extensions/ArticleFeedbackv5/sql/alter.sql
===================================================================
--- trunk/extensions/ArticleFeedbackv5/sql/alter.sql 2012-03-05 18:53:59 UTC
(rev 113061)
+++ trunk/extensions/ArticleFeedbackv5/sql/alter.sql 2012-03-05 18:54:09 UTC
(rev 113062)
@@ -140,3 +140,7 @@
-- set has_comment appropriately from current values
UPDATE aft_article_feedback, aft_article_answer SET af_has_comment = TRUE
WHERE af_bucket_id = 1 AND af_id = aa_feedback_id AND aa_response_text IS NOT
NULL;
+
+-- Added 3/5 (emsmith)\
+DROP INDEX /*_*/af_net_helpfulness_af_id;
+CREATE INDEX /*_*/af_net_helpfulness_af_id ON /*_*/aft_article_feedback
(af_net_helpfulness, af_id);
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs