From 5d8b39cf543d7527e3b75d4437b3b254d4896251 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Fri, 12 Oct 2012 02:57:37 +0000
Subject: [PATCH] Fixing another regression breaking scheduled reports
git-svn-id: http://dev.piwik.org/svn/trunk@7162 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
plugins/Actions/ArchivingHelper.php | 14 +++++++-------
...firstSite_lastN__API.getProcessedReport_day.xml | 9 ++++++++-
...ites_differentDays__Actions.getPageUrls_day.xml | 3 +++
...es_differentDays__Actions.getPageUrls_month.xml | 2 ++
...tes_differentDays__Actions.getPageUrls_week.xml | 2 ++
...tes_differentDays__Actions.getPageUrls_year.xml | 2 ++
...entDays_idSiteOne___Actions.getPageUrls_day.xml | 2 ++
...tDays_idSiteOne___Actions.getPageUrls_month.xml | 1 +
...ntDays_idSiteOne___Actions.getPageUrls_week.xml | 1 +
...ntDays_idSiteOne___Actions.getPageUrls_year.xml | 1 +
10 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 5cecd26d1c..dc1c6301cb 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -42,7 +42,7 @@ class Piwik_Actions_ArchivingHelper
$row['idaction'] = -$row['type'];
}
- $url = false;
+ $url = '';
if(!empty($row['name'])
&& $row['name'] != Piwik_DataTable::LABEL_SUMMARY_ROW
&& $row['type'] != Piwik_Tracker_Action::TYPE_ACTION_NAME)
@@ -83,10 +83,6 @@ class Piwik_Actions_ArchivingHelper
}
}
- unset($row['name']);
- unset($row['type']);
- unset($row['idaction']);
- unset($row['url_prefix']);
if (is_null($actionRow))
{
@@ -98,8 +94,7 @@ class Piwik_Actions_ArchivingHelper
// For example http://piwik.org and http://id.piwik.org are reported in Piwik > Actions > Pages with /index
// But, we must make sure http://piwik.org is used to link & for transitions
// Note: this code is partly duplicated from Piwik_DataTable_Row->sumRowMetadata()
- if( !empty($url)
- && $actionType != Piwik_Tracker_Action::TYPE_ACTION_NAME
+ if( $row['type'] != Piwik_Tracker_Action::TYPE_ACTION_NAME
&& !$actionRow->isSummaryRow())
{
if(($existingUrl = $actionRow->getMetadata('url')) !== false)
@@ -118,6 +113,11 @@ class Piwik_Actions_ArchivingHelper
}
}
+ unset($row['name']);
+ unset($row['type']);
+ unset($row['idaction']);
+ unset($row['url_prefix']);
+
foreach($row as $name => $value)
{
// in some edge cases, we have twice the same action name with 2 different idaction
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 464781cae8..b84615a11f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -109,7 +109,11 @@
<url>http://example.org/products</url>
</row>
</result>
- <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Monday 4 January 2010">
+ <row>
+ <url />
+ </row>
+ </result>
<result prettyDate="Tuesday 5 January 2010">
<row>
<url>http://example.org/index.htm</url>
@@ -117,6 +121,9 @@
<row>
<url>http://example.org/thankyou</url>
</row>
+ <row>
+ <url />
+ </row>
</result>
<result prettyDate="Wednesday 6 January 2010" />
<result prettyDate="Thursday 7 January 2010" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index 7e74036e3f..ecbc005807 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -42,6 +42,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-01-05">
@@ -83,6 +84,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-01-06" />
@@ -118,6 +120,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-01-05" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index 082ac02215..733039fac3 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -27,6 +27,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/products</label>
@@ -94,6 +95,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-02" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index 1cea307538..ba482d9d1b 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -42,6 +42,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/index.htm</label>
@@ -107,6 +108,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="From 2010-01-11 to 2010-01-17" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 915c126496..1806e680c7 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -27,6 +27,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/products</label>
@@ -94,6 +95,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2011" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index 9c6ce30724..b4a9f6ef60 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -41,6 +41,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-01-05">
@@ -82,6 +83,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
</result>
<result date="2010-01-06" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index d924940f54..1487979451 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -26,6 +26,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/products</label>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 95a894ed44..cf32d0ed6f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -41,6 +41,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/index.htm</label>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index 918dd96ba6..f52b7ab618 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -26,6 +26,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
+ <url />
</row>
<row>
<label>/products</label>
--
GitLab