diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2013-11-09 20:19:39 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2013-11-09 20:19:39 +0400 |
| commit | da2cd08bfccf146142d65b72145c189faf9cc466 (patch) | |
| tree | 409860feac90dd9ea0b61efb2a58773a245a97fc /plugins/VisitorInterest/Archiver.php | |
| parent | e8f588e243576a847fe323573538f542dfd567c0 (diff) | |
Refs #4200, refactor LogAggregator a bit (change signature of getSelectsFromRangedColumn) and document a bit more.
Diffstat (limited to 'plugins/VisitorInterest/Archiver.php')
| -rw-r--r-- | plugins/VisitorInterest/Archiver.php | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php index 4075aff9bd..7c5daedd93 100644 --- a/plugins/VisitorInterest/Archiver.php +++ b/plugins/VisitorInterest/Archiver.php @@ -97,19 +97,22 @@ class Archiver extends \Piwik\Plugin\Archiver self::DAYS_SINCE_LAST_RECORD_NAME => 'dslv', ); - $aggregatesMetadata = array( - array('visit_total_time', self::getSecondsGap(), 'log_visit', $prefixes[self::TIME_SPENT_RECORD_NAME]), - array('visit_total_actions', self::$pageGap, 'log_visit', $prefixes[self::PAGES_VIEWED_RECORD_NAME]), - array('visitor_count_visits', self::$visitNumberGap, 'log_visit', $prefixes[self::VISITS_COUNT_RECORD_NAME]), - array('visitor_days_since_last', self::$daysSinceLastVisitGap, 'log_visit', $prefixes[self::DAYS_SINCE_LAST_RECORD_NAME], - $restrictToReturningVisitors = true - ), - ); + // collect our extra aggregate select fields $selects = array(); - foreach ($aggregatesMetadata as $aggregateMetadata) { - $selectsFromRangedColumn = LogAggregator::getSelectsFromRangedColumn($aggregateMetadata); - $selects = array_merge($selects, $selectsFromRangedColumn); - } + $selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn( + 'visit_total_time', self::getSecondsGap(), 'log_visit', $prefixes[self::TIME_SPENT_RECORD_NAME] + )); + $selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn( + 'visit_total_actions', self::$pageGap, 'log_visit', $prefixes[self::PAGES_VIEWED_RECORD_NAME] + )); + $selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn( + 'visitor_count_visits', self::$visitNumberGap, 'log_visit', $prefixes[self::VISITS_COUNT_RECORD_NAME] + )); + $selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn( + 'visitor_days_since_last', self::$daysSinceLastVisitGap, 'log_visit', $prefixes[self::DAYS_SINCE_LAST_RECORD_NAME], + $restrictToReturningVisitors = true + )); + $query = $this->getLogAggregator()->queryVisitsByDimension(array(), $where = false, $selects, array()); $row = $query->fetch(); foreach ($prefixes as $recordName => $selectAsPrefix) { |