Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-07-17 23:34:35 +0300
committerGitHub <noreply@github.com>2018-07-17 23:34:35 +0300
commit74334d8d0908910ed3cc4a9a918436d9f9ccc3f6 (patch)
treebada789873ec90c243f2d04d21d1e24341948a41 /plugins/Contents/Archiver.php
parent6a505441d26513aef2c1937d9be7ecb632eaf020 (diff)
Refactor archivers to support multiple idsites (#13168)
* refactor archivers to support multiple idsites * added a test to ensure multiple sites work * add comment
Diffstat (limited to 'plugins/Contents/Archiver.php')
-rw-r--r--plugins/Contents/Archiver.php12
1 files changed, 4 insertions, 8 deletions
diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php
index ea922195b6..9a642e29bd 100644
--- a/plugins/Contents/Archiver.php
+++ b/plugins/Contents/Archiver.php
@@ -103,10 +103,8 @@ class Archiver extends \Piwik\Plugin\Archiver
)
);
- $where = "log_link_visit_action.server_time >= ?
- AND log_link_visit_action.server_time <= ?
- AND log_link_visit_action.idsite = ?
- AND log_link_visit_action.idaction_content_name IS NOT NULL
+ $where = $this->getLogAggregator()->getWhereStatement('log_link_visit_action', 'server_time');
+ $where .= " AND log_link_visit_action.idaction_content_name IS NOT NULL
AND log_link_visit_action.idaction_content_interaction IS NULL";
$groupBy = "log_link_visit_action.idaction_content_piece,
@@ -161,10 +159,8 @@ class Archiver extends \Piwik\Plugin\Archiver
)
);
- $where = "log_link_visit_action.server_time >= ?
- AND log_link_visit_action.server_time <= ?
- AND log_link_visit_action.idsite = ?
- AND log_link_visit_action.idaction_content_name IS NOT NULL
+ $where = $this->getLogAggregator()->getWhereStatement('log_link_visit_action', 'server_time');
+ $where .= " AND log_link_visit_action.idaction_content_name IS NOT NULL
AND log_link_visit_action.idaction_content_interaction IS NOT NULL";
$groupBy = "log_action_content_piece.idaction,