http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91484
Revision: 91484
Author: reedy
Date: 2011-07-05 20:24:03 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Add placeholder code for query normalisation
Modified Paths:
--------------
trunk/extensions/MetricsReporting/ApiAnalyticsBase.php
trunk/extensions/MetricsReporting/metrics/ComScoreReachPercentageMetric.php
trunk/extensions/MetricsReporting/metrics/ComScoreUniqueVisitorMetric.php
trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php
Modified: trunk/extensions/MetricsReporting/ApiAnalyticsBase.php
===================================================================
--- trunk/extensions/MetricsReporting/ApiAnalyticsBase.php 2011-07-05
20:22:40 UTC (rev 91483)
+++ trunk/extensions/MetricsReporting/ApiAnalyticsBase.php 2011-07-05
20:24:03 UTC (rev 91484)
@@ -49,8 +49,7 @@
}
if ( $this->canBeNormalised() && $params['normalized'] ) {
- // TODO: Do data normalisation stuffs here
- // Swap page_views for page_views_v
+ $params = $this->normaliseQueryParameters( $params );
}
// TODO: Data formatting
@@ -70,7 +69,7 @@
}
//note: this means if you specify a report language that is not
//fully supported, you won't get a full data set back
- if($this->takesReportLanguage()){
+ if( $this->takesReportLanguage() ){
$query['conds']['report_language'] =
$params['reportlanguage'];
}
@@ -197,6 +196,14 @@
}
/**
+ * @param $params array
+ * @return array
+ */
+ public function normaliseQueryParameters( $params ) {
+ return $params;
+ }
+
+ /**
* @return array
*/
public function getAllowedFilters() {
@@ -209,7 +216,7 @@
public /*abstract*/ function getMetricField() {
return '';
}
-
+
protected function takesReportLanguage(){
return false;
}
Modified:
trunk/extensions/MetricsReporting/metrics/ComScoreReachPercentageMetric.php
===================================================================
--- trunk/extensions/MetricsReporting/metrics/ComScoreReachPercentageMetric.php
2011-07-05 20:22:40 UTC (rev 91483)
+++ trunk/extensions/MetricsReporting/metrics/ComScoreReachPercentageMetric.php
2011-07-05 20:24:03 UTC (rev 91484)
@@ -27,7 +27,7 @@
protected function takesReportLanguage(){
return true;
}
-
+
public function getMetricField() {
return 'reach';
}
Modified:
trunk/extensions/MetricsReporting/metrics/ComScoreUniqueVisitorMetric.php
===================================================================
--- trunk/extensions/MetricsReporting/metrics/ComScoreUniqueVisitorMetric.php
2011-07-05 20:22:40 UTC (rev 91483)
+++ trunk/extensions/MetricsReporting/metrics/ComScoreUniqueVisitorMetric.php
2011-07-05 20:24:03 UTC (rev 91484)
@@ -28,7 +28,7 @@
protected function takesReportLanguage(){
return true;
}
-
+
public function getMetricField() {
return 'visitors';
}
Modified: trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php
===================================================================
--- trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php
2011-07-05 20:22:40 UTC (rev 91483)
+++ trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php
2011-07-05 20:24:03 UTC (rev 91484)
@@ -35,6 +35,12 @@
return true;
}
+ public function normaliseQueryParameters( $params ) {
+ // TODO: Change fields/table to normalise data set returned
+ // Swap page_views for page_views_v
+ return $params;
+ }
+
public function getDescription() {
return array(
'Total articles (htm component) requested from nearly
all Wikimedia wikis (exceptions are mostly special purpose wikis, e.g.
wikimania wikis)',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
