From 74334d8d0908910ed3cc4a9a918436d9f9ccc3f6 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 18 Jul 2018 08:34:35 +1200 Subject: Refactor archivers to support multiple idsites (#13168) * refactor archivers to support multiple idsites * added a test to ensure multiple sites work * add comment --- plugins/Contents/Archiver.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'plugins/Contents/Archiver.php') 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, -- cgit v1.2.3