diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 213ca1ea413380a6069355f38cabb14a71c99dfb..1fadf73e4d474cd7f37d2e8fa2dc39663a2abe2c 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -57,21 +57,18 @@ class Piwik_DataTable_Filter_Sort extends Piwik_DataTable_Filter
: (
!isset($a->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort])
? 1
- :(
- !isset($b->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort])
- ? -1
- : $this->sign * (
- $a->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort]
- < $b->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort]
- ? -1
- :( isset($a->c[Piwik_DataTable_Row::COLUMNS]['label'])
- ? strnatcasecmp(
- $a->c[Piwik_DataTable_Row::COLUMNS]['label'],
- $b->c[Piwik_DataTable_Row::COLUMNS]['label']
- )
+ :( ($a->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort] != $b->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort]
+ || !isset($a->c[Piwik_DataTable_Row::COLUMNS]['label']))
+ ? ( $this->sign * (
+ $a->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort]
+ < $b->c[Piwik_DataTable_Row::COLUMNS][$this->columnToSort]
+ ? -1
: 1
- )
+ )
)
+ : -1 * $this->sign * strnatcasecmp(
+ $a->c[Piwik_DataTable_Row::COLUMNS]['label'],
+ $b->c[Piwik_DataTable_Row::COLUMNS]['label'])
)
)
;
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 049117dc86bffe6313464e33a17bab773a1b720d..17aa19ce343bd4600a54a722439e09431dc6074e 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -442,6 +442,10 @@ class Piwik_Goals extends Piwik_Plugin
{
$row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_REVENUE] = round($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_REVENUE]);
}
+ if($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE] == round($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE]))
+ {
+ $row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE] = round($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE]);
+ }
$items[$dimension][$ecommerceType][$label] = $row;
}
}
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
index 21ba329dbd2819410a37595dfff8de30ce09cd04..7ce318c28b7e0bd5627e75b8887ad9e8b42aa42b 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
@@ -33,6 +33,21 @@
</row>
</subtable>
</row>
+ <row>
+ <label> incredible title!</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>5</entry_nb_actions>
+ <entry_sum_visit_length>1620</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ </row>
<row>
<label> Looking at homepage (again)...</label>
<nb_visits>1</nb_visits>
@@ -55,19 +70,4 @@
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
- <row>
- <label> incredible title!</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
- <entry_sum_visit_length>1620</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index 10d8d33e82a2ec42dc883d34b1220da5e8dce9e7..5a956994daf27751c3cc6b5f44824ff64532388c 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
@@ -1,5 +1,34 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>/index</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/</url>
+ </row>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>5</entry_nb_actions>
+ <entry_sum_visit_length>1620</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
<row>
<label>store</label>
<nb_visits>1</nb_visits>
@@ -34,33 +63,4 @@
</row>
</subtable>
</row>
- <row>
- <label>/index</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/</url>
- </row>
- <row>
- <label>/index.htm</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>2</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
- <entry_sum_visit_length>1620</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
- <exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <url>http://example.org/index.htm</url>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
index 11a77e877454590b95d52c6942fb9c4565ad67b8..996abdcf6404a84e12ee2ffcb7000116ef8db258 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>Websites</label>
+ <label>Search Engines</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>5</max_actions>
- <sum_visit_length>1620</sum_visit_length>
- <bounce_count>0</bounce_count>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
<goals>
- <row idgoal='1'>
+ <row idgoal='2'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <revenue>42</revenue>
+ <revenue>1</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
- <revenue>42</revenue>
+ <revenue>1</revenue>
</row>
<row>
- <label>Search Engines</label>
+ <label>Websites</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <nb_actions>5</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1620</sum_visit_length>
+ <bounce_count>0</bounce_count>
<goals>
- <row idgoal='2'>
+ <row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <revenue>1</revenue>
+ <revenue>42</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
- <revenue>1</revenue>
+ <revenue>42</revenue>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
index 1569715a9e72163e8c7345958f28f93c1f379526..9ddd1bed446fec2059b602fdf83f9898cff37ca5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
@@ -7,34 +7,34 @@
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
- <label>Java</label>
+ <label>Flash</label>
<nb_visits>2</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/java.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
- <label>Flash</label>
+ <label>Java</label>
<nb_visits>2</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
- <label>Gears</label>
+ <label>Director</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
- <label>Silverlight</label>
+ <label>Gears</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
- <label>Windowsmedia</label>
+ <label>Pdf</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Quicktime</label>
@@ -43,21 +43,21 @@
<logo>plugins/UserSettings/images/plugins/quicktime.gif</logo>
</row>
<row>
- <label>Director</label>
+ <label>Realplayer</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/director.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
</row>
<row>
- <label>Pdf</label>
+ <label>Silverlight</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
</row>
<row>
- <label>Realplayer</label>
+ <label>Windowsmedia</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
index 21ba329dbd2819410a37595dfff8de30ce09cd04..7ce318c28b7e0bd5627e75b8887ad9e8b42aa42b 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
@@ -33,6 +33,21 @@
</row>
</subtable>
</row>
+ <row>
+ <label> incredible title!</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>5</entry_nb_actions>
+ <entry_sum_visit_length>1620</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ </row>
<row>
<label> Looking at homepage (again)...</label>
<nb_visits>1</nb_visits>
@@ -55,19 +70,4 @@
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
- <row>
- <label> incredible title!</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
- <entry_sum_visit_length>1620</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index 10d8d33e82a2ec42dc883d34b1220da5e8dce9e7..5a956994daf27751c3cc6b5f44824ff64532388c 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
@@ -1,5 +1,34 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>/index</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/</url>
+ </row>
+ <row>
+ <label>/index.htm</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>5</entry_nb_actions>
+ <entry_sum_visit_length>1620</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/index.htm</url>
+ </row>
<row>
<label>store</label>
<nb_visits>1</nb_visits>
@@ -34,33 +63,4 @@
</row>
</subtable>
</row>
- <row>
- <label>/index</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/</url>
- </row>
- <row>
- <label>/index.htm</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>2</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
- <entry_sum_visit_length>1620</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
- <exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>180</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <url>http://example.org/index.htm</url>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
index 11a77e877454590b95d52c6942fb9c4565ad67b8..996abdcf6404a84e12ee2ffcb7000116ef8db258 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <label>Websites</label>
+ <label>Search Engines</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>5</max_actions>
- <sum_visit_length>1620</sum_visit_length>
- <bounce_count>0</bounce_count>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
<goals>
- <row idgoal='1'>
+ <row idgoal='2'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <revenue>42</revenue>
+ <revenue>1</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
- <revenue>42</revenue>
+ <revenue>1</revenue>
</row>
<row>
- <label>Search Engines</label>
+ <label>Websites</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <nb_actions>5</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1620</sum_visit_length>
+ <bounce_count>0</bounce_count>
<goals>
- <row idgoal='2'>
+ <row idgoal='1'>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <revenue>1</revenue>
+ <revenue>42</revenue>
</row>
</goals>
<nb_conversions>1</nb_conversions>
- <revenue>1</revenue>
+ <revenue>42</revenue>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
index 1569715a9e72163e8c7345958f28f93c1f379526..9ddd1bed446fec2059b602fdf83f9898cff37ca5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
@@ -7,34 +7,34 @@
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
- <label>Java</label>
+ <label>Flash</label>
<nb_visits>2</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/java.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
- <label>Flash</label>
+ <label>Java</label>
<nb_visits>2</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/flash.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
- <label>Gears</label>
+ <label>Director</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
- <label>Silverlight</label>
+ <label>Gears</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
- <label>Windowsmedia</label>
+ <label>Pdf</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Quicktime</label>
@@ -43,21 +43,21 @@
<logo>plugins/UserSettings/images/plugins/quicktime.gif</logo>
</row>
<row>
- <label>Director</label>
+ <label>Realplayer</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/director.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
</row>
<row>
- <label>Pdf</label>
+ <label>Silverlight</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo>
</row>
<row>
- <label>Realplayer</label>
+ <label>Windowsmedia</label>
<nb_visits>0</nb_visits>
<nb_visits_percentage>0%</nb_visits_percentage>
- <logo>plugins/UserSettings/images/plugins/realplayer.gif</logo>
+ <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
index 4a8009ea0d452e2dad504fbf6e1c680027d43bed..3ae15d19fe32034f0c831c25c537216970bd29d4 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
@@ -4,6 +4,14 @@
<result date="2010-01-03" />
<result date="2010-01-04" />
<result date="2010-01-05">
+ <row>
+ <label>/mailto:test@example.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <url>mailto:test@example.org</url>
+ </row>
<row>
<label>mailto:test@example.org</label>
<nb_visits>1</nb_visits>
@@ -23,14 +31,6 @@
</row>
</subtable>
</row>
- <row>
- <label>/mailto:test@example.org</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <url>mailto:test@example.org</url>
- </row>
</result>
<result date="2010-01-06" />
<result date="2010-01-07" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
index faa3148eeae07c01bfbc5f8be0deeee58179d367..81af46ca4d956211ec1c94cfb23c32a3c8f79edc 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
@@ -2,6 +2,14 @@
<results>
<result idSite="1">
<result date="2010-01">
+ <row>
+ <label>/mailto:test@example.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <url>mailto:test@example.org</url>
+ </row>
<row>
<label>mailto:test@example.org</label>
<nb_visits>1</nb_visits>
@@ -21,14 +29,6 @@
</row>
</subtable>
</row>
- <row>
- <label>/mailto:test@example.org</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <url>mailto:test@example.org</url>
- </row>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
index eb00ba48210dc5ab44bed1965ea49c4f29fdbf55..0423744ff29bd528b2363c1d43c05f05b44bdf6f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
@@ -3,6 +3,14 @@
<result idSite="1">
<result date="2009-12-28 to 2010-01-03" />
<result date="2010-01-04 to 2010-01-10">
+ <row>
+ <label>/mailto:test@example.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <url>mailto:test@example.org</url>
+ </row>
<row>
<label>mailto:test@example.org</label>
<nb_visits>1</nb_visits>
@@ -22,14 +30,6 @@
</row>
</subtable>
</row>
- <row>
- <label>/mailto:test@example.org</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <url>mailto:test@example.org</url>
- </row>
</result>
<result date="2010-01-11 to 2010-01-17" />
<result date="2010-01-18 to 2010-01-24" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
index 83bd496dc01aa8fed9dd486a5230709246fcc40c..aba3c0a521c1780f29885d8fc08b8486638187df 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
@@ -2,6 +2,14 @@
<results>
<result idSite="1">
<result date="2010">
+ <row>
+ <label>/mailto:test@example.org</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>180</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <url>mailto:test@example.org</url>
+ </row>
<row>
<label>mailto:test@example.org</label>
<nb_visits>1</nb_visits>
@@ -21,14 +29,6 @@
</row>
</subtable>
</row>
- <row>
- <label>/mailto:test@example.org</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>180</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <url>mailto:test@example.org</url>
- </row>
</result>
<result date="2011" />
<result date="2012" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
index e91916f991db56b8f95170e38872e5fd530f59bc..d9037334b6c4e2d66292cfb66c478c24d92fa9a4 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
@@ -60,26 +60,26 @@
<exit_rate>0%</exit_rate>
<subtable>
<row>
- <label> second page view</label>
+ <label> a new visit</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
<row>
- <label> a new visit</label>
+ <label> second page view</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
index dcfde2bd995c6df8f2e74aefb801a41e8578123e..5f691f318dc65d11e7f5433315265394db4e1fd0 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
@@ -46,26 +46,26 @@
<exit_rate>0%</exit_rate>
<subtable>
<row>
- <label> second page view</label>
+ <label> a new visit</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
<row>
- <label> a new visit</label>
+ <label> second page view</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
index 11c2526451ef9570570e1a7c582adffa472ce592..9cd6f980bfc4bc27aa901c7646920b0ed5cad5b1 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
@@ -48,26 +48,26 @@
<exit_rate>0%</exit_rate>
<subtable>
<row>
- <label> second page view</label>
+ <label> a new visit</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
<row>
- <label> a new visit</label>
+ <label> second page view</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
index 5ae46a54f32dc29e2adec790591c2eb563157180..2e4e182e2fe4141e3a9d8b36f0aab00f3566ff27 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
@@ -46,26 +46,26 @@
<exit_rate>0%</exit_rate>
<subtable>
<row>
- <label> second page view</label>
+ <label> a new visit</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
<row>
- <label> a new visit</label>
+ <label> second page view</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
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 92cc681d9d852f2d63c131db50c06c3f25ec366f..c10a6359663739992de02ad4400f01104d65ed41 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
@@ -2,6 +2,17 @@
<results>
<result idSite="1">
<result date="2010-01-03">
+ <row>
+ <label>/homepage</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/homepage</url>
+ </row>
<row>
<label>/products</label>
<nb_visits>1</nb_visits>
@@ -20,17 +31,6 @@
<exit_rate>100%</exit_rate>
<url>http://example.org/products</url>
</row>
- <row>
- <label>/homepage</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/homepage</url>
- </row>
</result>
<result date="2010-01-04">
<row>
@@ -47,31 +47,31 @@
</result>
<result date="2010-01-05">
<row>
- <label>/thankyou</label>
+ <label>/homepage</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <url>http://example.org/thankyou</url>
+ <url>http://example.org/homepage</url>
</row>
<row>
- <label>/homepage</label>
+ <label>/thankyou</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <url>http://example.org/homepage</url>
+ <url>http://example.org/thankyou</url>
</row>
</result>
<result date="2010-01-06" />
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 b9d1acb081fec9fa82b6e06c93ee5747f2d9b822..d3428ca2c8fe4a1fe22c02079f1dfe5400e2a558 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
@@ -18,17 +18,6 @@
<exit_rate>0%</exit_rate>
<url>http://example.org/homepage</url>
</row>
- <row>
- <label>/thankyou</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>360</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/thankyou</url>
- </row>
<row>
<label>/products</label>
<nb_visits>1</nb_visits>
@@ -47,6 +36,17 @@
<exit_rate>100%</exit_rate>
<url>http://example.org/products</url>
</row>
+ <row>
+ <label>/thankyou</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>360</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_time_on_page>360</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/thankyou</url>
+ </row>
<row>
<label>page url not defined</label>
<nb_visits>1</nb_visits>
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 a6916d10584f37cb650d75098fc785b04922c3d5..003a4ae28ff6b09568e6082bdb03ab9d7b1adc59 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
@@ -2,6 +2,17 @@
<results>
<result idSite="1">
<result date="2009-12-28 to 2010-01-03">
+ <row>
+ <label>/homepage</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/homepage</url>
+ </row>
<row>
<label>/products</label>
<nb_visits>1</nb_visits>
@@ -20,45 +31,34 @@
<exit_rate>100%</exit_rate>
<url>http://example.org/products</url>
</row>
- <row>
- <label>/homepage</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/homepage</url>
- </row>
</result>
<result date="2010-01-04 to 2010-01-10">
<row>
- <label>/thankyou</label>
+ <label>/homepage</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
+ <entry_sum_visit_length>900</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <url>http://example.org/thankyou</url>
+ <url>http://example.org/homepage</url>
</row>
<row>
- <label>/homepage</label>
+ <label>/thankyou</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
- <entry_sum_visit_length>900</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <url>http://example.org/homepage</url>
+ <url>http://example.org/thankyou</url>
</row>
<row>
<label>page url not defined</label>
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 19b419e61f507cabb3a9b7a1451ff5e18649c79d..06ca25a2acd857b93c3a2e844e0b2de38648d9e1 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
@@ -18,17 +18,6 @@
<exit_rate>0%</exit_rate>
<url>http://example.org/homepage</url>
</row>
- <row>
- <label>/thankyou</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>360</sum_time_spent>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <url>http://example.org/thankyou</url>
- </row>
<row>
<label>/products</label>
<nb_visits>1</nb_visits>
@@ -47,6 +36,17 @@
<exit_rate>100%</exit_rate>
<url>http://example.org/products</url>
</row>
+ <row>
+ <label>/thankyou</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>360</sum_time_spent>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_time_on_page>360</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/thankyou</url>
+ </row>
<row>
<label>page url not defined</label>
<nb_visits>1</nb_visits>
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index 3c5635cb3ffe8600efef4d003acf3035502a8aad..4f39a84f2b053926b6a3d1e1f3191cbd933207ea 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>7 May 11 - 13 May 11</prettyDate>
+ <prettyDate>10 May 11 - 16 May 11</prettyDate>
<metadata>
<category>Visitors</category>
<name>Country</name>