From 3ffd63639ddbcc1be6606213b4b582c560e50b45 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 4 Nov 2013 19:40:57 +1300
Subject: [PATCH] Renaming archiveDay -> aggregateDayReport and archivePeriod
-> aggregateMultipleReports
---
core/ArchiveProcessor.php | 4 +-
core/ArchiveProcessor/Day.php | 22 +++++------
core/ArchiveProcessor/Period.php | 38 +++++++++----------
core/Plugin/Archiver.php | 16 ++++----
core/Tracker.php | 2 +-
plugins/Actions/Actions.php | 12 +++---
plugins/Actions/Archiver.php | 12 ++++--
.../DataTableRowAction/MultiRowEvolution.php | 2 +-
plugins/CustomVariables/Archiver.php | 4 +-
plugins/CustomVariables/CustomVariables.php | 12 +++---
plugins/DevicesDetection/Archiver.php | 4 +-
plugins/DevicesDetection/DevicesDetection.php | 12 +++---
plugins/Goals/Archiver.php | 4 +-
plugins/Goals/Goals.php | 12 +++---
plugins/Provider/Archiver.php | 4 +-
plugins/Provider/Provider.php | 12 +++---
plugins/Referrers/Archiver.php | 4 +-
plugins/Referrers/Referrers.php | 12 +++---
plugins/UserCountry/Archiver.php | 4 +-
plugins/UserCountry/UserCountry.php | 12 +++---
plugins/UserSettings/Archiver.php | 4 +-
plugins/UserSettings/UserSettings.php | 12 +++---
plugins/VisitTime/Archiver.php | 4 +-
plugins/VisitTime/VisitTime.php | 12 +++---
plugins/VisitorInterest/Archiver.php | 4 +-
plugins/VisitorInterest/VisitorInterest.php | 12 +++---
26 files changed, 129 insertions(+), 123 deletions(-)
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index a9a96b2b3f..b15eae075d 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -53,7 +53,7 @@ use Piwik\Period;
* **Inserting numeric data**
*
* // function in an Archiver descendent
- * public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ * public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
* {
* $myFancyMetric = // ... calculate the metric value ...
* $archiveProcessor->insertNumericRecord('MyPlugin_myFancyMetric', $myFancyMetric);
@@ -62,7 +62,7 @@ use Piwik\Period;
* **Inserting serialized DataTables**
*
* // function in an Archiver descendent
- * public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ * public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
* {
* $maxRowsInTable = Config::getInstance()->General['datatable_archiving_maximum_rows_standard'];j
*
diff --git a/core/ArchiveProcessor/Day.php b/core/ArchiveProcessor/Day.php
index a28bf567a4..511aa19707 100644
--- a/core/ArchiveProcessor/Day.php
+++ b/core/ArchiveProcessor/Day.php
@@ -19,7 +19,7 @@ use Piwik\Piwik;
/**
* Initiates the archiving process for **day** periods via the [ArchiveProcessor.Day.compute](#)
* event.
- *
+ *
* @package Piwik
* @subpackage ArchiveProcessor
*
@@ -29,7 +29,7 @@ class Day extends ArchiveProcessor
{
/**
* Converts array to a datatable
- *
+ *
* @param DataArray $array
* @return \Piwik\DataTable
*/
@@ -111,27 +111,27 @@ class Day extends ArchiveProcessor
{
/**
* Triggered when the archiving process is initiated for a day period.
- *
+ *
* Plugins that compute analytics data should subscribe to this event. The
* actual archiving logic, however, should not be in the event handler, but
* in a class that descends from [Archiver](#).
- *
+ *
* To learn more about single day archiving, see the [ArchiveProcessor\Day](#)
* class.
- *
+ *
* **Example**
- *
- * public function archivePeriod(ArchiveProcessor\Day $archiveProcessor)
+ *
+ * public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
* {
* $archiving = new MyArchiver($archiveProcessor);
* if ($archiving->shouldArchive()) {
- * $archiving->archiveDay();
+ * $archiving->aggregateDayReport();
* }
* }
- *
- * @param Piwik\ArchiveProcessor\Day $archiveProcessor
+ *
+ * @param \Piwik\ArchiveProcessor\Day $archiveProcessor
* The ArchiveProcessor that triggered the event.
*/
- Piwik::postEvent('ArchiveProcessor.Day.compute', array(&$this));
+ Piwik::postEvent('ArchiveProcessor.aggregateDayReport', array(&$this));
}
}
\ No newline at end of file
diff --git a/core/ArchiveProcessor/Period.php b/core/ArchiveProcessor/Period.php
index f91400c640..1d3d272b2e 100644
--- a/core/ArchiveProcessor/Period.php
+++ b/core/ArchiveProcessor/Period.php
@@ -24,33 +24,33 @@ use Piwik\SettingsPiwik;
/**
* Initiates the archiving process for all non-day periods via the [ArchiveProcessor.Period.compute](#)
* event.
- *
+ *
* Period archiving differs from archiving day periods in that log tables are not aggregated.
* Instead the data from periods within the non-day period are aggregated. For example, if the data
* for a month is being archived, this ArchiveProcessor will select the aggregated data for each
* day in the month and add them together. This is much faster than running aggregation queries over
* the entire set of visits.
- *
+ *
* If data has not been archived for the subperiods, archiving will be launched for those subperiods.
*
* ### Examples
- *
+ *
* **Archiving metric data**
- *
+ *
* // function in an Archiver descendent
- * public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ * public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
* {
* $archiveProcessor->aggregateNumericMetrics('myFancyMetric', 'sum');
* $archiveProcessor->aggregateNumericMetrics('myOtherFancyMetric', 'max');
* }
- *
+ *
* **Archiving report data**
- *
+ *
* // function in an Archiver descendent
- * public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ * public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
* {
* $maxRowsInTable = Config::getInstance()->General['datatable_archiving_maximum_rows_standard'];j
- *
+ *
* $archiveProcessor->aggregateDataTableReports(
* 'MyPlugin_myFancyReport',
* $maxRowsInTable,
@@ -58,7 +58,7 @@ use Piwik\SettingsPiwik;
* $columnToSortByBeforeTruncation = Metrics::INDEX_NB_VISITS,
* );
* }
- *
+ *
* @package Piwik
* @subpackage ArchiveProcessor
*
@@ -83,7 +83,7 @@ class Period extends ArchiveProcessor
/**
* Sums records for every subperiod of the current period and inserts the result as the record
* for this period.
- *
+ *
* DataTables are summed recursively so subtables will be summed as well.
*
* @param string|array $recordNames Name(s) of the report we are aggregating, eg, `'Referrers_type'`.
@@ -222,25 +222,25 @@ class Period extends ArchiveProcessor
{
/**
* Triggered when the archiving process is initiated for a non-day period.
- *
+ *
* Plugins that compute analytics data should subscribe to this event. The
* actual archiving logic, however, should not be in the event handler, but
* in a class that descends from [Archiver](#).
- *
+ *
* To learn more about non-day period archiving, see the [ArchiveProcessor\Period](#)
* class.
- *
+ *
* **Example**
- *
- * public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ *
+ * public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
* {
* $archiving = new MyArchiver($archiveProcessor);
* if ($archiving->shouldArchive()) {
- * $archiving->archivePeriod();
+ * $archiving->aggregateMultipleReports();
* }
* }
- *
- * @param Piwik\ArchiveProcessor\Period $archiveProcessor
+ *
+ * @param \Piwik\ArchiveProcessor\Period $archiveProcessor
* The ArchiveProcessor that triggered the event.
*/
Piwik::postEvent('ArchiveProcessor.Period.compute', array(&$this));
diff --git a/core/Plugin/Archiver.php b/core/Plugin/Archiver.php
index b1bb8d68e7..101ec4afd5 100644
--- a/core/Plugin/Archiver.php
+++ b/core/Plugin/Archiver.php
@@ -24,7 +24,7 @@ use Piwik\Config as PiwikConfig;
*
* class MyArchiver extends Archiver
* {
- * public function archiveDay()
+ * public function aggregateDayReport()
* {
* $logAggregator = $this->getLogAggregator();
*
@@ -37,7 +37,7 @@ use Piwik\Config as PiwikConfig;
* $archiveProcessor->insertBlobRecords('MyPlugin_myReport', $dataTable->getSerialized(500));
* }
*
- * public function archivePeriod()
+ * public function aggregateMultipleReports()
* {
* $archiveProcessor = $this->getProcessor();
* $archiveProcessor->aggregateDataTableReports('MyPlugin_myReport', 500);
@@ -47,20 +47,20 @@ use Piwik\Config as PiwikConfig;
* **Using Archiver in archiving events**
*
* // event observer for ArchiveProcessor.Day.compute
- * public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ * public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
* {
* $archiving = new Archiver($archiveProcessor);
* if ($archiving->shouldArchive()) {
- * $archiving->archiveDay();
+ * $archiving->aggregateDayReport();
* }
* }
*
* // event observer for ArchiveProcessor.Period.compute
- * public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ * public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
* {
* $archiving = new Archiver($archiveProcessor);
* if ($archiving->shouldArchive()) {
- * $archiving->archivePeriod();
+ * $archiving->aggregateMultipleReports();
* }
* }
*
@@ -85,12 +85,12 @@ abstract class Archiver
/**
* Archive data for a day period.
*/
- abstract public function archiveDay();
+ abstract public function aggregateDayReport();
/**
* Archive data for a non-day period.
*/
- abstract public function archivePeriod();
+ abstract public function aggregateMultipleReports();
// todo: review this concept, each plugin should somehow maintain the list of report names they generate
/**
diff --git a/core/Tracker.php b/core/Tracker.php
index 67a7612acb..121cbab35b 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -592,7 +592,7 @@ class Tracker
* event can force the use of a custom visit object that extends from
* [Piwik\Tracker\VisitInterface](#).
*
- * @param Piwik\Tracker\VisitInterface &$visit Initialized to null, but can be set to
+ * @param \Piwik\Tracker\VisitInterface &$visit Initialized to null, but can be set to
* a created Visit object. If it isn't
* modified Piwik uses the default class.
*/
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index f15e82ce07..0ae62a7700 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -39,8 +39,8 @@ class Actions extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenus',
'API.getReportMetadata' => 'getReportMetadata',
@@ -512,19 +512,19 @@ class Actions extends \Piwik\Plugin
* For each action we process the "interest statistics" :
* visits, unique visitors, bounce count, sum visit length.
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
- function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index 94263033c2..3a37d05f4d 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -87,7 +87,7 @@ class Archiver extends \Piwik\Plugin\Archiver
*
* @return bool
*/
- public function archiveDay()
+ public function aggregateDayReport()
{
$rankingQueryLimit = ArchivingHelper::getRankingQueryLimit();
ArchivingHelper::reloadConfig();
@@ -332,7 +332,7 @@ class Archiver extends \Piwik\Plugin\Archiver
/**
* Exit actions
*/
- public function archiveDayExitActions($rankingQueryLimit)
+ protected function archiveDayExitActions($rankingQueryLimit)
{
$rankingQuery = false;
if ($rankingQueryLimit > 0) {
@@ -514,7 +514,13 @@ class Archiver extends \Piwik\Plugin\Archiver
$dataTable->deleteColumns($columnsToDelete);
}
- public function archivePeriod()
+ // archiveDayReportFromLogs
+ // archiveMultipleReportsSum
+
+ // aggregateDayReportFromLogs
+ // aggregateMultipleReports
+
+ public function aggregateMultipleReports()
{
ArchivingHelper::reloadConfig();
$dataTableToSum = array(
diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
index ebbe52facf..b7af4d664b 100644
--- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -58,7 +58,7 @@ class MultiRowEvolution extends RowEvolution
/**
* Render the popover
- * @param Piwik_CoreHome_Controller
+ * @param \Piwik\Plugins\CoreHome\Controller $controller
* @param View (the popover_rowevolution template)
*/
public function renderPopover($controller, $view)
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index 036e8611dd..bea92f36b8 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -40,7 +40,7 @@ class Archiver extends \Piwik\Plugin\Archiver
$this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_variables'];
}
- public function archiveDay()
+ public function aggregateDayReport()
{
$this->dataArray = new DataArray();
@@ -201,7 +201,7 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$nameToCount = $this->getProcessor()->aggregateDataTableReports(
self::CUSTOM_VARIABLE_RECORD_NAME, $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable,
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 63c85655e3..07d8570cea 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -35,8 +35,8 @@ class CustomVariables extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenus',
'Goals.getReportsWithGoalMetrics' => 'getReportsWithGoalMetrics',
@@ -137,19 +137,19 @@ class CustomVariables extends \Piwik\Plugin
/**
* Hooks on daily archive to trigger various log processing
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php
index fc02c0e06d..749555dc8e 100644
--- a/plugins/DevicesDetection/Archiver.php
+++ b/plugins/DevicesDetection/Archiver.php
@@ -31,7 +31,7 @@ class Archiver extends \Piwik\Plugin\Archiver
const BROWSER_FIELD = "config_browser_name";
const BROWSER_VERSION_DIMENSION = "CONCAT(log_visit.config_browser_name, ';', log_visit.config_browser_version)";
- public function archiveDay()
+ public function aggregateDayReport()
{
$this->aggregateByLabel(self::DEVICE_TYPE_FIELD, self::DEVICE_TYPE_RECORD_NAME);
$this->aggregateByLabel(self::DEVICE_BRAND_FIELD, self::DEVICE_BRAND_RECORD_NAME);
@@ -49,7 +49,7 @@ class Archiver extends \Piwik\Plugin\Archiver
$this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS));
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTablesToSum = array(
self::DEVICE_TYPE_RECORD_NAME,
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index a6ebe5eb5d..ae6db510f5 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -91,8 +91,8 @@ class DevicesDetection extends \Piwik\Plugin
public function getListHooksRegistered()
{
return array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'Menu.Reporting.addItems' => 'addMenu',
'Tracker.newVisitorInformation' => 'parseMobileVisitData',
'WidgetsList.addWidgets' => 'addWidgets',
@@ -272,19 +272,19 @@ class DevicesDetection extends \Piwik\Plugin
Common::printDebug($deviceInfo);
}
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php
index a17b9a8dfa..33802c2194 100644
--- a/plugins/Goals/Archiver.php
+++ b/plugins/Goals/Archiver.php
@@ -84,7 +84,7 @@ class Archiver extends \Piwik\Plugin\Archiver
*/
protected $itemReports = array();
- public function archiveDay()
+ public function aggregateDayReport()
{
$this->archiveGeneralGoalMetrics();
$this->archiveEcommerceItems();
@@ -379,7 +379,7 @@ class Archiver extends \Piwik\Plugin\Archiver
/**
* @internal param $this->getProcessor()
*/
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
/*
* Archive Ecommerce Items
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 3ef3e8b213..6b752b16d4 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -92,8 +92,8 @@ class Goals extends \Piwik\Plugin
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'Site.getSiteAttributes' => 'fetchGoalsFromDb',
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'API.getReportMetadata.end' => 'getReportMetadata',
'API.getSegmentsMetadata' => 'getSegmentsMetadata',
'WidgetsList.addWidgets' => 'addWidgets',
@@ -512,11 +512,11 @@ class Goals extends \Piwik\Plugin
* Will process Goal stats overall and for each Goal.
* Also processes the New VS Returning visitors conversion stats.
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
@@ -524,11 +524,11 @@ class Goals extends \Piwik\Plugin
* Hooks on Period archiving.
* Sums up Goal conversions stats, and processes overall conversion rate
*/
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php
index 101ea8ecdf..e611d4b499 100644
--- a/plugins/Provider/Archiver.php
+++ b/plugins/Provider/Archiver.php
@@ -17,14 +17,14 @@ class Archiver extends \Piwik\Plugin\Archiver
const PROVIDER_RECORD_NAME = 'Provider_hostnameExt';
const PROVIDER_FIELD = "location_provider";
- public function archiveDay()
+ public function aggregateDayReport()
{
$metrics = $this->getProcessor()->getMetricsForDimension(self::PROVIDER_FIELD);
$tableProvider = $this->getProcessor()->getDataTableFromDataArray($metrics);
$this->getProcessor()->insertBlobRecord(self::PROVIDER_RECORD_NAME, $tableProvider->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS));
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$this->getProcessor()->aggregateDataTableReports(array(self::PROVIDER_RECORD_NAME), $this->maximumRows);
}
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 5ff9fcabb0..bbe44bc155 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -35,8 +35,8 @@ class Provider extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'Tracker.newVisitorInformation' => 'enrichVisitWithProviderInfo',
'WidgetsList.addWidgets' => 'addWidget',
'Menu.Reporting.addItems' => 'addMenu',
@@ -223,19 +223,19 @@ class Provider extends \Piwik\Plugin
/**
* Daily archive: processes the report Visits by Provider
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php
index 85f39579ed..3e6de4bc8a 100644
--- a/plugins/Referrers/Archiver.php
+++ b/plugins/Referrers/Archiver.php
@@ -50,7 +50,7 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
- public function archiveDay()
+ public function aggregateDayReport()
{
foreach ($this->getRecordNames() as $record) {
$this->arrays[$record] = new DataArray();
@@ -231,7 +231,7 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTableToSum = $this->getRecordNames();
$nameToCount = $this->getProcessor()->aggregateDataTableReports($dataTableToSum, $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation);
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index af6f164944..f1320cd762 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -37,8 +37,8 @@ class Referrers extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenus',
'Goals.getReportsWithGoalMetrics' => 'getReportsWithGoalMetrics',
@@ -280,11 +280,11 @@ class Referrers extends \Piwik\Plugin
/**
* Hooks on daily archive to trigger various log processing
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
@@ -292,11 +292,11 @@ class Referrers extends \Piwik\Plugin
* Period archiving: sums up daily stats and sums report tables,
* making sure that tables are still truncated.
*/
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php
index 29e576a833..987ffc1d72 100644
--- a/plugins/UserCountry/Archiver.php
+++ b/plugins/UserCountry/Archiver.php
@@ -43,7 +43,7 @@ class Archiver extends \Piwik\Plugin\Archiver
const LATITUDE_FIELD = 'location_latitude';
const LONGITUDE_FIELD = 'location_longitude';
- public function archiveDay()
+ public function aggregateDayReport()
{
foreach ($this->dimensions as $dimension) {
$this->arrays[$dimension] = new DataArray();
@@ -165,7 +165,7 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTableToSum = array(
self::COUNTRY_RECORD_NAME,
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index add65f2046..71f0397cec 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -42,8 +42,8 @@ class UserCountry extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenu',
'Menu.Admin.addItems' => 'addAdminMenu',
@@ -329,19 +329,19 @@ class UserCountry extends \Piwik\Plugin
));
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index bba4d085b6..4c5d40abc4 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -41,7 +41,7 @@ class Archiver extends \Piwik\Plugin\Archiver
const OS_DIMENSION = "log_visit.config_os";
const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)";
- public function archiveDay()
+ public function aggregateDayReport()
{
$this->aggregateByConfiguration();
$this->aggregateByOs();
@@ -149,7 +149,7 @@ class Archiver extends \Piwik\Plugin\Archiver
return $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS));
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTableToSum = array(
self::CONFIGURATION_RECORD_NAME,
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index f459e908c0..d85e4a4ae2 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -169,8 +169,8 @@ class UserSettings extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenu',
'API.getReportMetadata' => 'getReportMetadata',
@@ -473,22 +473,22 @@ class UserSettings extends \Piwik\Plugin
* by Browser, Browser family, etc. Some reports are built from the logs, some reports
* are superset of an existing report (eg. Browser family is built from the Browser report)
*/
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
/**
* Period archiving: simply sums up daily archives
*/
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
}
\ No newline at end of file
diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php
index 0bd362226b..df560ab34a 100644
--- a/plugins/VisitTime/Archiver.php
+++ b/plugins/VisitTime/Archiver.php
@@ -19,7 +19,7 @@ class Archiver extends \Piwik\Plugin\Archiver
const SERVER_TIME_RECORD_NAME = 'VisitTime_serverTime';
const LOCAL_TIME_RECORD_NAME = 'VisitTime_localTime';
- public function archiveDay()
+ public function aggregateDayReport()
{
$this->aggregateByLocalTime();
$this->aggregateByServerTime();
@@ -73,7 +73,7 @@ class Archiver extends \Piwik\Plugin\Archiver
}
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTableToSum = array(
self::LOCAL_TIME_RECORD_NAME,
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 2053192514..6471d25143 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -35,8 +35,8 @@ class VisitTime extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenu',
'Goals.getReportsWithGoalMetrics' => 'getReportsWithGoalMetrics',
@@ -196,19 +196,19 @@ class VisitTime extends \Piwik\Plugin
}
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php
index e5660b6bf2..647c4c536c 100644
--- a/plugins/VisitorInterest/Archiver.php
+++ b/plugins/VisitorInterest/Archiver.php
@@ -86,7 +86,7 @@ class Archiver extends \Piwik\Plugin\Archiver
array(364)
);
- public function archiveDay()
+ public function aggregateDayReport()
{
// these prefixes are prepended to the 'SELECT as' parts of each SELECT expression. detecting
// these prefixes allows us to get all the data in one query.
@@ -139,7 +139,7 @@ class Archiver extends \Piwik\Plugin\Archiver
return $secondsGap;
}
- public function archivePeriod()
+ public function aggregateMultipleReports()
{
$dataTableToSum = array(
self::TIME_SPENT_RECORD_NAME,
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index 41f328367c..fa36941119 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -33,8 +33,8 @@ class VisitorInterest extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessor.Day.compute' => 'archiveDay',
- 'ArchiveProcessor.Period.compute' => 'archivePeriod',
+ 'ArchiveProcessor.aggregateDayReport' => 'aggregateDayReport',
+ 'ArchiveProcessor.Period.compute' => 'aggregateMultipleReports',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.Reporting.addItems' => 'addMenu',
'API.getReportMetadata' => 'getReportMetadata',
@@ -125,19 +125,19 @@ class VisitorInterest extends \Piwik\Plugin
Piwik::addAction('Template.footerVisitsFrequency', array('Piwik\Plugins\VisitorInterest\VisitorInterest', 'footerVisitsFrequency'));
}
- public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
+ public function aggregateMultipleReports(ArchiveProcessor\Period $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archivePeriod();
+ $archiving->aggregateMultipleReports();
}
}
- public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
+ public function aggregateDayReport(ArchiveProcessor\Day $archiveProcessor)
{
$archiving = new Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
- $archiving->archiveDay();
+ $archiving->aggregateDayReport();
}
}
--
GitLab