refs #1454 archiving (unique) pageviews, (unique) downloads and (unique) outlinks

git-svn-id: http://dev.piwik.org/svn/trunk@5387 59fd770c-687e-43c8-a1e3-f5a4ff64c105

3 files changed, 20 insertions, 0 deletions

diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index e0e5ae3b8d..1a73768de6 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -466,18 +466,24 @@ class Piwik_Actions extends Piwik_Plugin
 		$this->deleteInvalidSummedColumnsFromDataTable($dataTable);
 		$s = $dataTable->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation );
 		$archiveProcessing->insertBlobRecord('Actions_actions_url', $s);
+		$archiveProcessing->insertNumericRecord('nb_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS)));
+		$archiveProcessing->insertNumericRecord('nb_uniq_pageviews', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS)));
 		destroy($dataTable);
 
 		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_DOWNLOAD]);
 		$this->deleteInvalidSummedColumnsFromDataTable($dataTable);
 		$s = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation );
 		$archiveProcessing->insertBlobRecord('Actions_downloads', $s);
+		$archiveProcessing->insertNumericRecord('nb_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS)));
+		$archiveProcessing->insertNumericRecord('nb_uniq_downloads', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS)));
 		destroy($dataTable);
 
 		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_OUTLINK]);
 		$this->deleteInvalidSummedColumnsFromDataTable($dataTable);
 		$s = $dataTable->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation );
 		$archiveProcessing->insertBlobRecord('Actions_outlink', $s);
+		$archiveProcessing->insertNumericRecord('nb_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_PAGE_NB_HITS)));
+		$archiveProcessing->insertNumericRecord('nb_uniq_outlinks', array_sum($dataTable->getColumn(Piwik_Archive::INDEX_NB_VISITS)));
 		destroy($dataTable);
 
 		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_ACTION_NAME]);
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 0e686c553e..63dd059c77 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -63,6 +63,14 @@ class Piwik_VisitsSummary_API
 								'nb_visits',
 								'nb_uniq_visitors',
 								'nb_actions',
+								// hits, downloads and outlinks are archived by the actions plugin
+								// nevertheless, we can use them directly
+								'nb_pageviews',
+								'nb_uniq_pageviews',
+								'nb_downloads',
+								'nb_uniq_downloads',
+								'nb_outlinks',
+								'nb_uniq_outlinks',
 								'nb_visits_converted',
 								'bounce_count',
 								'sum_visit_length',
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index 20303a27da..9d8cd04872 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -54,6 +54,12 @@ class Piwik_VisitsSummary extends Piwik_Plugin
 								'nb_actions',
 								'nb_actions_per_visit',
 								'bounce_rate',
+								'nb_pageviews' => Piwik_Translate('General_ColumnPageviews'),
+								'nb_uniq_pageviews' => Piwik_Translate('General_ColumnUniquePageviews'),
+								'nb_downloads' => Piwik_Translate('Actions_ColumnDownloads'),
+								'nb_uniq_downloads' => Piwik_Translate('Actions_ColumnUniqueDownloads'),
+								'nb_outlinks' => Piwik_Translate('Actions_ColumnOutlinks'),
+								'nb_uniq_outlinks' => Piwik_Translate('Actions_ColumnUniqueOutlinks'),
 								'avg_time_on_site' => Piwik_Translate('General_VisitDuration'),
 								'max_actions' => Piwik_Translate('General_ColumnMaxActions'),
 // Used to process metrics, not displayed/used directly