http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97629
Revision: 97629
Author: reedy
Date: 2011-09-20 14:58:15 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Be smarter about group by/order by building them slightly more dynamically
Modified Paths:
--------------
trunk/extensions/MetricsReporting/metrics/GenericMetricBase.php
Modified: trunk/extensions/MetricsReporting/metrics/GenericMetricBase.php
===================================================================
--- trunk/extensions/MetricsReporting/metrics/GenericMetricBase.php
2011-09-20 14:53:10 UTC (rev 97628)
+++ trunk/extensions/MetricsReporting/metrics/GenericMetricBase.php
2011-09-20 14:58:15 UTC (rev 97629)
@@ -28,10 +28,26 @@
}
protected function getQueryInfo() {
+ $params = $this->extractRequestParams();
+
+ if ( $params['selectcountries'] || $params['selectproject'] ) {
+ $items = array();
+ if ( $params['selectproject'] ) {
+ $items[] = $params['selectproject'];
+ }
+ if ( $params['selectcountries'] ) {
+ $items[] = $params['selectcountries'];
+ }
+ $string = explode( ',', $items );
+ $options = array( 'GROUP BY' => $string, 'ORDER BY' =>
$string );
+ } else {
+ // Fallback to date
+ $options = array( 'GROUP BY' => 'date', 'ORDER BY' =>
'date' );
+ }
return array(
'table' => array( $this->tableName ),
'conds' => array(),
- 'options' => array( 'GROUP BY' => 'date', 'ORDER BY' =>
'date' ),
+ 'options' => $options,
'join_conds' => array(),
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
