From be8c66f04d43f0349f671fde50aad4ca05dda84d Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Mon, 31 Oct 2011 08:59:33 +0000
Subject: [PATCH] refs #1454 * rename API to Actions.get * EN translation fix
* tests update, fix build?
git-svn-id: http://dev.piwik.org/svn/trunk@5395 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
lang/en.php | 2 +-
plugins/Actions/API.php | 10 +++-
plugins/VisitsSummary/API.php | 2 +-
...inner1_trans-de__VisitsSummary.get_day.csv | Bin 744 -> 750 bytes
...stomVariables.getCustomVariables_range.xml | 50 +++++++++---------
...aAndNormalAPI__VisitsSummary.get_range.xml | 2 +-
...inner1_trans-de__VisitsSummary.get_day.csv | Bin 744 -> 750 bytes
7 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/lang/en.php b/lang/en.php
index 8107b47d47..7aea8a1ca0 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -1420,7 +1420,7 @@ Note: this token will expire in 24 hrs.",
'VisitsSummary_VisitsSummaryDocumentation' => 'This is an overview of the visit evolution.',
'VisitsSummary_NbVisits' => '%s visits',
'VisitsSummary_NbUniqueVisitors' => '%s unique visitors',
- 'VisitsSummary_NbActions' => '%s actions',
+ 'VisitsSummary_NbActionsDescription' => '%s actions',
'VisitsSummary_NbPageviewsDescription' => '%s pageviews ',
'VisitsSummary_NbUniquePageviewsDescription' => '%s unique pageviews ',
'VisitsSummary_NbDownloadsDescription' => '%s downloads ',
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 37d9789710..2e6a7eee0c 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -48,7 +48,15 @@ class Piwik_Actions_API
return $this->getPageTitles( $idSite, $period, $date, $segment, $expanded, $idSubtable );
}
- public function getActionCounts( $idSite, $period, $date, $segment = false)
+ /**
+ * Returns the list of metrics (pages, downloads, outlinks)
+ *
+ * @param int $idSite
+ * @param string $period
+ * @param string $date
+ * @param string $segment
+ */
+ public function get( $idSite, $period, $date, $segment = false)
{
Piwik::checkUserHasViewAccess( $idSite );
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index cdd688d275..254a3def5f 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -95,7 +95,7 @@ class Piwik_VisitsSummary_API
}
// include action counts from actions plugin
- $actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'getActionCounts', compact('idSite', 'period', 'date', 'segment'));
+ $actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'get', compact('idSite', 'period', 'date', 'segment'));
$this->mergeDataTables($dataTable, $actionCounts);
// If only a computed metrics was requested, we delete other metrics
diff --git a/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 977e448ecca307a3f2e25e03dfd6344050a71512..2e4d3f75d7f6814246243e19a72e0aa66158f619 100644
GIT binary patch
delta 21
dcmaFC`i^x&71Lw~CXvY<Og4;qlaDef0{~YU2KxX2
delta 27
icmaFI`hs;s6%%JDLmopWLm@-y<W43>MxDv0nUn#1r3g0w
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index c910d2c315..f220f4ef87 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -10,18 +10,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>2</nb_conversions>
-
+ <nb_visits_converted>2</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>3</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>LoggedOut</label>
@@ -33,18 +33,18 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
<row idgoal='2'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>2</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>LoggedIn</label>
@@ -56,13 +56,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -76,31 +76,31 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_actions>1</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>1000</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -114,13 +114,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>Value not defined</label>
@@ -132,13 +132,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -152,13 +152,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -170,13 +170,13 @@
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
-
+ <nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -188,13 +188,13 @@
<label>looking at profile page</label>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Loggedin</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -206,7 +206,7 @@
<label>Value not defined</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
@@ -218,7 +218,7 @@
<label>FR</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
-
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
</row>
</subtable>
</row>
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
index dc7a402dbc..78b8f4353a 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
@@ -2,7 +2,7 @@
<result>
<nb_visits>3</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
+
<bounce_count>2</bounce_count>
<sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
diff --git a/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/integration/processed/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 977e448ecca307a3f2e25e03dfd6344050a71512..2e4d3f75d7f6814246243e19a72e0aa66158f619 100644
GIT binary patch
delta 21
dcmaFC`i^x&71Lw~CXvY<Og4;qlaDef0{~YU2KxX2
delta 27
icmaFI`hs;s6%%JDLmopWLm@-y<W43>MxDv0nUn#1r3g0w
--
GitLab