From d449954b8303fee70ef446cc69e8c4f6115727ee Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 5 Oct 2015 17:41:27 +1300
Subject: [PATCH] Segment auto-suggest dropdown now behaves as expected for
Download URL, outlink URL and Page URL + tests
---
plugins/API/API.php | 28 +-
plugins/Live/Visitor.php | 17 +-
...tributeHistoricalDataWithLocationsTest.php | 1 +
...ithSomeData__UserCountry.getCity_month.xml | 30 +-
...meData__UserCountry.getContinent_month.xml | 18 +-
...SomeData__UserCountry.getCountry_month.xml | 42 +-
...hSomeData__UserCountry.getRegion_month.xml | 30 +-
.../PHPUnit/Fixtures/ManyVisitsWithGeoIP.php | 14 +
...ITest__Live.getLastVisitsDetails_range.xml | 1143 +++++++++++------
...ions__API.getSuggestedValuesForSegment.xml | 4 +-
...t_browserCode__VisitsSummary.get_range.xml | 10 +-
...rowserVersion__VisitsSummary.get_range.xml | 10 +-
...tAPITest_city__VisitsSummary.get_range.xml | 10 +-
...continentCode__VisitsSummary.get_range.xml | 10 +-
...t_countryCode__VisitsSummary.get_range.xml | 10 +-
...VariableName1__VisitsSummary.get_range.xml | 10 +-
...VariableName5__VisitsSummary.get_range.xml | 10 +-
...mVariableName__VisitsSummary.get_range.xml | 10 +-
...blePageValue4__VisitsSummary.get_range.xml | 10 +-
...ablePageValue__VisitsSummary.get_range.xml | 10 +-
...ariableValue1__VisitsSummary.get_range.xml | 10 +-
...ariableValue5__VisitsSummary.get_range.xml | 10 +-
...VariableValue__VisitsSummary.get_range.xml | 10 +-
...nceFirstVisit__VisitsSummary.get_range.xml | 10 +-
...commerceOrder__VisitsSummary.get_range.xml | 10 +-
...inceLastVisit__VisitsSummary.get_range.xml | 10 +-
...st_deviceType__VisitsSummary.get_range.xml | 10 +-
...t_eventAction__VisitsSummary.get_range.xml | 10 +-
...eventCategory__VisitsSummary.get_range.xml | 10 +-
...est_eventName__VisitsSummary.get_range.xml | 10 +-
..._languageCode__VisitsSummary.get_range.xml | 10 +-
...Test_latitude__VisitsSummary.get_range.xml | 10 +-
...ingSystemCode__VisitsSummary.get_range.xml | 10 +-
...SystemVersion__VisitsSummary.get_range.xml | 10 +-
...eUrl__API.getSuggestedValuesForSegment.xml | 2 +-
...ITest_pageUrl__VisitsSummary.get_range.xml | 18 +-
..._referrerType__VisitsSummary.get_range.xml | 10 +-
...st_regionCode__VisitsSummary.get_range.xml | 10 +-
...st_resolution__VisitsSummary.get_range.xml | 10 +-
...Test_searches__VisitsSummary.get_range.xml | 10 +-
...SearchKeyword__VisitsSummary.get_range.xml | 10 +-
...nvertedGoalId__VisitsSummary.get_range.xml | 10 +-
...isitConverted__VisitsSummary.get_range.xml | 10 +-
...st_visitCount__VisitsSummary.get_range.xml | 10 +-
...tion__API.getSuggestedValuesForSegment.xml | 2 +-
...ommerceStatus__VisitsSummary.get_range.xml | 10 +-
...ITest_visitIp__VisitsSummary.get_range.xml | 10 +-
...isitLocalHour__VisitsSummary.get_range.xml | 10 +-
...est_visitorId__VisitsSummary.get_range.xml | 10 +-
...t_visitorType__VisitsSummary.get_range.xml | 10 +-
...mit_1__Live.getLastVisitsDetails_month.xml | 118 +-
...mit_2__Live.getLastVisitsDetails_month.xml | 66 +-
...Visit__Live.getLastVisitsDetails_month.xml | 188 ++-
...tDesc__Live.getLastVisitsDetails_month.xml | 188 ++-
...eTest__Live.getLastVisitsDetails_month.xml | 306 +++--
...WebsiteTest__UserCountry.getCity_month.xml | 66 +-
...teTest__UserCountry.getContinent_month.xml | 24 +-
...siteTest__UserCountry.getCountry_month.xml | 60 +-
...bsiteTest__UserCountry.getRegion_month.xml | 54 +-
...delowpop__UserCountry.getCountry_month.xml | 12 +-
...egment_city__UserCountry.getCity_month.xml | 6 +-
...t_city__UserCountry.getContinent_month.xml | 6 +-
...ent_city__UserCountry.getCountry_month.xml | 6 +-
...ment_city__UserCountry.getRegion_month.xml | 6 +-
...ontinent__UserCountry.getCountry_month.xml | 30 +-
...nt_lat_long__UserCountry.getCity_month.xml | 6 +-
...t_long__UserCountry.getContinent_month.xml | 6 +-
...lat_long__UserCountry.getCountry_month.xml | 6 +-
..._lat_long__UserCountry.getRegion_month.xml | 6 +-
...ment_region__UserCountry.getCity_month.xml | 12 +-
...region__UserCountry.getContinent_month.xml | 6 +-
...t_region__UserCountry.getCountry_month.xml | 6 +-
...nt_region__UserCountry.getRegion_month.xml | 6 +-
...ssedMetric__API.getProcessedReport_day.xml | 6 +-
...pEmptyRows__API.getProcessedReport_day.xml | 8 +-
...eportMetadata__API.getSegmentsMetadata.xml | 12 +
...ng_flattened__Actions.getDownloads_day.xml | 3 +
...ing_flattened__Actions.getOutlinks_day.xml | 3 +
...ryDisabled__Actions.getDownloads_range.xml | 25 +
79 files changed, 1843 insertions(+), 1123 deletions(-)
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 809c94fa13..4ea0cb4055 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -202,6 +202,23 @@ class API extends \Piwik\Plugin\API
return $segments;
}
+ /**
+ * @param $segmentName
+ * @param $table
+ * @return array
+ */
+ protected function getSegmentValuesFromVisitorLog($segmentName, $table)
+ {
+ // Cleanup data to return the top suggested (non empty) labels for this segment
+ $values = $table->getColumn($segmentName);
+
+
+ // Select also flattened keys (custom variables "page" scope, page URLs for one visit, page titles for one visit)
+ $valuesBis = $table->getColumnsStartingWith($segmentName . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP);
+ $values = array_merge($values, $valuesBis);
+ return $values;
+ }
+
private function sortSegments($row1, $row2)
{
$customVarCategory = Piwik::translate('CustomVariables_CustomVariables');
@@ -538,12 +555,7 @@ class API extends \Piwik\Plugin\API
if ($suggestedValuesCallbackRequiresTable) {
$values = call_user_func($segmentFound['suggestedValuesCallback'], $idSite, $maxSuggestionsToReturn, $table);
} else {
- // Cleanup data to return the top suggested (non empty) labels for this segment
- $values = $table->getColumn($segmentName);
-
- // Select also flattened keys (custom variables "page" scope, page URLs for one visit, page titles for one visit)
- $valuesBis = $table->getColumnsStartingWith($segmentName . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP);
- $values = array_merge($values, $valuesBis);
+ $values = $this->getSegmentValuesFromVisitorLog($segmentName, $table);
}
$values = $this->getMostFrequentValues($values);
@@ -588,7 +600,9 @@ class API extends \Piwik\Plugin\API
// If you update this, also update flattenVisitorDetailsArray
$segmentsNeedActionsInfo = array('visitConvertedGoalId',
'pageUrl', 'pageTitle', 'siteSearchKeyword',
- 'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl');
+ 'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl',
+ 'outlinkUrl', 'downloadUrl'
+ );
$isCustomVariablePage = stripos($segmentName, 'customVariablePage') !== false;
$isEventSegment = stripos($segmentName, 'event') !== false;
$isContentSegment = stripos($segmentName, 'content') !== false;
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index a330f3ea3a..6d679a8a05 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -193,12 +193,21 @@ class Visitor implements VisitorInterface
// Flatten Page Titles/URLs
$count = 1;
foreach ($visitorDetailsArray['actionDetails'] as $action) {
- if (!empty($action['url'])) {
- $flattenedKeyName = 'pageUrl' . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
- $visitorDetailsArray[$flattenedKeyName] = $action['url'];
- }
// API.getSuggestedValuesForSegment
+ $flattenForActionType = array(
+ 'outlink' => 'outlinkUrl',
+ 'download' => 'downloadUrl',
+ 'action' => 'pageUrl'
+ );
+ foreach($flattenForActionType as $actionType => $flattenedKeyPrefix) {
+ if (!empty($action['url'])
+ && $action['type'] == $actionType) {
+ $flattenedKeyName = $flattenedKeyPrefix . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $visitorDetailsArray[$flattenedKeyName] = $action['url'];
+ }
+ }
+
$flatten = array( 'pageTitle', 'siteSearchKeyword', 'eventCategory', 'eventAction', 'eventName', 'eventValue');
foreach($flatten as $toFlatten) {
if (!empty($action[$toFlatten])) {
diff --git a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
index 5fb3bf7c92..9b0429c7c9 100644
--- a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
+++ b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Console\Tester\CommandTester;
* @package Piwik\Plugins\UserCountry\Test\Integration
*
* @group UserCountry
+ * @group AttributeHistoricalDataWithLocations
*/
class AttributeHistoricalDataWithLocationsTest extends IntegrationTestCase
{
diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml
index cd97a16b89..1a9caf8a5a 100644
--- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml
+++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Unknown</label>
<nb_visits>22</nb_visits>
- <nb_actions>39</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>13871</sum_visit_length>
+ <nb_actions>61</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>17831</sum_visit_length>
<bounce_count>11</bounce_count>
<goals>
<row idgoal='1'>
@@ -34,9 +34,9 @@
<row>
<label>Vancouver, British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -67,9 +67,9 @@
<row>
<label>Besançon, Franche-Comte, France</label>
<nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>7</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -100,9 +100,9 @@
<row>
<label>Lhasa, Unknown, Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -133,9 +133,9 @@
<row>
<label>Rome, Lazio, Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml
index ea3cb0fc36..d410c25319 100644
--- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml
+++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Asia</label>
<nb_visits>22</nb_visits>
- <nb_actions>38</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>13871</sum_visit_length>
+ <nb_actions>60</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>17831</sum_visit_length>
<bounce_count>11</bounce_count>
<goals>
<row idgoal='1'>
@@ -28,9 +28,9 @@
<row>
<label>North America</label>
<nb_visits>8</nb_visits>
- <nb_actions>14</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>5044</sum_visit_length>
+ <nb_actions>22</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
<bounce_count>4</bounce_count>
<goals>
<row idgoal='1'>
@@ -53,9 +53,9 @@
<row>
<label>Europe</label>
<nb_visits>5</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>13</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml
index f9dc03dca9..faa38d2190 100644
--- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml
+++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>China</label>
<nb_visits>18</nb_visits>
- <nb_actions>32</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>11349</sum_visit_length>
+ <nb_actions>50</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>14589</sum_visit_length>
<bounce_count>9</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -61,9 +61,9 @@
<row>
<label>France</label>
<nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>7</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -90,9 +90,9 @@
<row>
<label>Indonesia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -119,9 +119,9 @@
<row>
<label>Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -148,9 +148,9 @@
<row>
<label>Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -177,9 +177,9 @@
<row>
<label>United States</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml
index 1885070cfd..107dc47a28 100644
--- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml
+++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Unknown</label>
<nb_visits>22</nb_visits>
- <nb_actions>39</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>13871</sum_visit_length>
+ <nb_actions>61</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>17831</sum_visit_length>
<bounce_count>11</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -62,9 +62,9 @@
<row>
<label>Franche-Comte, France</label>
<nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>7</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -92,9 +92,9 @@
<row>
<label>Lazio, Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -122,9 +122,9 @@
<row>
<label>Unknown, Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 02dd26cc98..c413635c8e 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -163,6 +163,20 @@ class ManyVisitsWithGeoIP extends Fixture
self::checkResponse($r);
}
+ $date = $date->addHour(0.05);
+ $t->setForceVisitDateTime($date->getDatetime());
+ $t->doTrackAction('http://example.org/path/file' . $i . '.zip', "download" );
+ if (!$doBulk) {
+ self::checkResponse($r);
+ }
+
+ $date = $date->addHour(0.05);
+ $t->setForceVisitDateTime($date->getDatetime());
+ $r = $t->doTrackAction('http://example-outlink.org/' . $i . '.html', "link" );
+ if (!$doBulk) {
+ self::checkResponse($r);
+ }
+
$date = $date->addHour(0.05);
$t->setForceVisitDateTime($date->getDatetime());
$r = $t->doTrackEvent('Cat' . $i, 'Action' . $i, 'Name' . $i, 345.678 + $i );
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 78ca0553c4..df849a8f3f 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -11,7 +11,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>61</goalPageId>
+ <goalPageId>95</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -23,7 +23,7 @@
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>61</pageId>
+ <pageId>95</pageId>
<icon />
</row>
@@ -105,9 +105,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -120,35 +117,35 @@
<visitIp>1.2.4.8</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>30</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>30</pageId>
+ <pageId>46</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>46</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>31</pageId>
+ <pageId>47</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -171,13 +168,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file8.zip</url>
+ <pageTitle />
+ <pageIdAction>46</pageIdAction>
+
+ <pageId>48</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/8.html</url>
+ <pageTitle />
+ <pageIdAction>47</pageIdAction>
+
+ <pageId>49</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>32</pageId>
+ <pageId>50</pageId>
<eventCategory>Cat8</eventCategory>
<eventAction>Action8</eventAction>
<eventName>Name8</eventName>
@@ -204,10 +225,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -271,9 +292,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -291,7 +309,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>29</goalPageId>
+ <goalPageId>45</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -303,7 +321,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>29</pageId>
+ <pageId>45</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -403,9 +421,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -418,28 +433,28 @@
<visitIp>1.2.4.7</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>27</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>27</pageId>
+ <pageId>41</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>41</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -451,13 +466,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file7.zip</url>
+ <pageTitle />
+ <pageIdAction>41</pageIdAction>
+
+ <pageId>42</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/7.html</url>
+ <pageTitle />
+ <pageIdAction>42</pageIdAction>
+
+ <pageId>43</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>28</pageId>
+ <pageId>44</pageId>
<eventCategory>Cat7</eventCategory>
<eventAction>Action7</eventAction>
<eventName>Name7</eventName>
@@ -484,10 +523,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -551,9 +590,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -571,7 +607,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>26</goalPageId>
+ <goalPageId>40</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -583,7 +619,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>26</pageId>
+ <pageId>40</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -683,9 +719,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -698,35 +731,35 @@
<visitIp>1.2.4.6</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>23</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>23</pageId>
+ <pageId>35</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>35</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>36</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -749,13 +782,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file6.zip</url>
+ <pageTitle />
+ <pageIdAction>36</pageIdAction>
+
+ <pageId>37</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/6.html</url>
+ <pageTitle />
+ <pageIdAction>37</pageIdAction>
+
+ <pageId>38</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>39</pageId>
<eventCategory>Cat6</eventCategory>
<eventAction>Action6</eventAction>
<eventName>Name6</eventName>
@@ -782,10 +839,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -849,9 +906,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -869,7 +923,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>22</goalPageId>
+ <goalPageId>34</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -881,7 +935,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>22</pageId>
+ <pageId>34</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -981,9 +1035,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -996,28 +1047,28 @@
<visitIp>1.2.4.5</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>20</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>20</pageId>
+ <pageId>30</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>30</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -1029,13 +1080,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file5.zip</url>
+ <pageTitle />
+ <pageIdAction>31</pageIdAction>
+
+ <pageId>31</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/5.html</url>
+ <pageTitle />
+ <pageIdAction>32</pageIdAction>
+
+ <pageId>32</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>21</pageId>
+ <pageId>33</pageId>
<eventCategory>Cat5</eventCategory>
<eventAction>Action5</eventAction>
<eventName>Name5</eventName>
@@ -1062,10 +1137,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1129,9 +1204,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -1149,7 +1221,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>19</goalPageId>
+ <goalPageId>29</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -1161,7 +1233,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>19</pageId>
+ <pageId>29</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1261,9 +1333,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -1276,35 +1345,35 @@
<visitIp>1.2.4.4</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>16</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>16</pageId>
+ <pageId>24</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>24</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>17</pageId>
+ <pageId>25</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -1327,13 +1396,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file4.zip</url>
+ <pageTitle />
+ <pageIdAction>26</pageIdAction>
+
+ <pageId>26</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/4.html</url>
+ <pageTitle />
+ <pageIdAction>27</pageIdAction>
+
+ <pageId>27</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>18</pageId>
+ <pageId>28</pageId>
<eventCategory>Cat4</eventCategory>
<eventAction>Action4</eventAction>
<eventName>Name4</eventName>
@@ -1360,10 +1453,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1427,9 +1520,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>awesomeisp.com</provider>
- <providerName>Awesomeisp</providerName>
- <providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1447,7 +1537,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>15</goalPageId>
+ <goalPageId>23</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -1459,7 +1549,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>15</pageId>
+ <pageId>23</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1559,9 +1649,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>awesomeisp.com</provider>
- <providerName>Awesomeisp</providerName>
- <providerUrl>http://www.awesomeisp.com/</providerUrl>
@@ -1574,28 +1661,28 @@
<visitIp>1.2.4.3</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>13</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>13</pageId>
+ <pageId>19</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>19</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -1607,13 +1694,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file3.zip</url>
+ <pageTitle />
+ <pageIdAction>21</pageIdAction>
+
+ <pageId>20</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/3.html</url>
+ <pageTitle />
+ <pageIdAction>22</pageIdAction>
+
+ <pageId>21</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>14</pageId>
+ <pageId>22</pageId>
<eventCategory>Cat3</eventCategory>
<eventAction>Action3</eventAction>
<eventName>Name3</eventName>
@@ -1640,10 +1751,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1707,9 +1818,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -1722,28 +1830,28 @@
<visitIp>113.62.1.1</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>52</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>52</pageId>
+ <pageId>80</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>80</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -1755,13 +1863,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file3.zip</url>
+ <pageTitle />
+ <pageIdAction>21</pageIdAction>
+
+ <pageId>81</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/3.html</url>
+ <pageTitle />
+ <pageIdAction>22</pageIdAction>
+
+ <pageId>82</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>53</pageId>
+ <pageId>83</pageId>
<eventCategory>Cat3</eventCategory>
<eventAction>Action3</eventAction>
<eventName>Name3</eventName>
@@ -1788,10 +1920,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1847,9 +1979,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -1867,7 +1996,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>12</goalPageId>
+ <goalPageId>18</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -1879,7 +2008,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>12</pageId>
+ <pageId>18</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1979,9 +2108,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -1999,7 +2125,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>51</goalPageId>
+ <goalPageId>79</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2011,7 +2137,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>51</pageId>
+ <pageId>79</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2111,9 +2237,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -2126,35 +2249,35 @@
<visitIp>1.2.4.2</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>9</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>9</pageId>
+ <pageId>13</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>13</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>10</pageId>
+ <pageId>14</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -2177,13 +2300,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file2.zip</url>
+ <pageTitle />
+ <pageIdAction>16</pageIdAction>
+
+ <pageId>15</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/2.html</url>
+ <pageTitle />
+ <pageIdAction>17</pageIdAction>
+
+ <pageId>16</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>11</pageId>
+ <pageId>17</pageId>
<eventCategory>Cat2</eventCategory>
<eventAction>Action2</eventAction>
<eventName>Name2</eventName>
@@ -2210,10 +2357,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -2277,9 +2424,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>comcast.net</provider>
- <providerName>Comcast</providerName>
- <providerUrl>http://www.comcast.net/</providerUrl>
@@ -2292,35 +2436,35 @@
<visitIp>2001:db8:85a3::8a2e:370:7334</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>48</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>48</pageId>
+ <pageId>74</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>74</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>49</pageId>
+ <pageId>75</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -2343,13 +2487,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file2.zip</url>
+ <pageTitle />
+ <pageIdAction>16</pageIdAction>
+
+ <pageId>76</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/2.html</url>
+ <pageTitle />
+ <pageIdAction>17</pageIdAction>
+
+ <pageId>77</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>50</pageId>
+ <pageId>78</pageId>
<eventCategory>Cat2</eventCategory>
<eventAction>Action2</eventAction>
<eventName>Name2</eventName>
@@ -2376,10 +2544,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -2435,9 +2603,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -2455,7 +2620,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>8</goalPageId>
+ <goalPageId>12</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2467,7 +2632,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>8</pageId>
+ <pageId>12</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2567,9 +2732,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>comcast.net</provider>
- <providerName>Comcast</providerName>
- <providerUrl>http://www.comcast.net/</providerUrl>
@@ -2587,7 +2749,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>47</goalPageId>
+ <goalPageId>73</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2599,7 +2761,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>47</pageId>
+ <pageId>73</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -2699,9 +2861,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -2714,28 +2873,28 @@
<visitIp>1.2.4.1</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>6</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>6</pageId>
+ <pageId>8</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>8</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -2747,13 +2906,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file1.zip</url>
+ <pageTitle />
+ <pageIdAction>11</pageIdAction>
+
+ <pageId>9</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/1.html</url>
+ <pageTitle />
+ <pageIdAction>12</pageIdAction>
+
+ <pageId>10</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>7</pageId>
+ <pageId>11</pageId>
<eventCategory>Cat1</eventCategory>
<eventAction>Action1</eventAction>
<eventName>Name1</eventName>
@@ -2780,10 +2963,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -2847,9 +3030,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -2862,38 +3042,62 @@
<visitIp>::ffff:137.82.130.49</visitIp>
<actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/space/quest/iv</url>
+ <pageTitle>Space Quest XII</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+ <pageId>58</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon />
+
+ </row>
<row>
<type>goal</type>
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>38</goalPageId>
+ <goalPageId>58</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>two</goalName>
+ <goalId>2</goalId>
+ <revenue>5</revenue>
+ <goalPageId />
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
- <type>action</type>
- <url>http://piwik.net/space/quest/iv</url>
- <pageTitle>Space Quest XII</pageTitle>
- <pageIdAction>4</pageIdAction>
+ <type>download</type>
+ <url>http://example.org/path/file1.zip</url>
+ <pageTitle />
+ <pageIdAction>11</pageIdAction>
- <pageId>38</pageId>
+ <pageId>59</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
- <icon />
+ <icon>plugins/Morpheus/images/download.png</icon>
</row>
<row>
- <type>goal</type>
- <goalName>two</goalName>
- <goalId>2</goalId>
- <revenue>5</revenue>
- <goalPageId />
+ <type>outlink</type>
+ <url>http://example-outlink.org/1.html</url>
+ <pageTitle />
+ <pageIdAction>12</pageIdAction>
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
+ <pageId>60</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
</row>
<row>
@@ -2901,7 +3105,7 @@
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>39</pageId>
+ <pageId>61</pageId>
<eventCategory>Cat1</eventCategory>
<eventAction>Action1</eventAction>
<eventName>Name1</eventName>
@@ -2928,10 +3132,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -2995,9 +3199,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3010,28 +3211,28 @@
<visitIp>137.82.0.0</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>45</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>45</pageId>
+ <pageId>69</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>69</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -3043,13 +3244,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file1.zip</url>
+ <pageTitle />
+ <pageIdAction>11</pageIdAction>
+
+ <pageId>70</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/1.html</url>
+ <pageTitle />
+ <pageIdAction>12</pageIdAction>
+
+ <pageId>71</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>46</pageId>
+ <pageId>72</pageId>
<eventCategory>Cat1</eventCategory>
<eventAction>Action1</eventAction>
<eventName>Name1</eventName>
@@ -3076,10 +3301,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -3135,9 +3360,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3150,28 +3372,28 @@
<visitIp>103.29.196.229</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>59</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>59</pageId>
+ <pageId>91</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>91</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -3183,13 +3405,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file1.zip</url>
+ <pageTitle />
+ <pageIdAction>11</pageIdAction>
+
+ <pageId>92</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/1.html</url>
+ <pageTitle />
+ <pageIdAction>12</pageIdAction>
+
+ <pageId>93</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>60</pageId>
+ <pageId>94</pageId>
<eventCategory>Cat1</eventCategory>
<eventAction>Action1</eventAction>
<eventName>Name1</eventName>
@@ -3216,10 +3462,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -3283,9 +3529,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3303,7 +3546,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>5</goalPageId>
+ <goalPageId>7</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -3315,7 +3558,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>5</pageId>
+ <pageId>7</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3415,9 +3658,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3435,7 +3675,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>37</goalPageId>
+ <goalPageId>57</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -3447,7 +3687,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>37</pageId>
+ <pageId>57</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3547,9 +3787,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3567,7 +3804,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>44</goalPageId>
+ <goalPageId>68</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -3579,7 +3816,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>44</pageId>
+ <pageId>68</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3679,9 +3916,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3699,7 +3933,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>58</goalPageId>
+ <goalPageId>90</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -3711,7 +3945,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>58</pageId>
+ <pageId>90</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -3811,9 +4045,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3826,17 +4057,6 @@
<visitIp>1.2.4.0</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>2</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
@@ -3848,6 +4068,17 @@
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>2</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
@@ -3877,13 +4108,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file0.zip</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>4</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/0.html</url>
+ <pageTitle />
+ <pageIdAction>7</pageIdAction>
+
+ <pageId>5</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>4</pageId>
+ <pageId>6</pageId>
<eventCategory>Cat0</eventCategory>
<eventAction>Action0</eventAction>
<eventName>Name0</eventName>
@@ -3910,10 +4165,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -3977,9 +4232,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -3992,35 +4244,35 @@
<visitIp>194.57.91.215</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>34</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>34</pageId>
+ <pageId>52</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>52</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>35</pageId>
+ <pageId>53</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -4043,13 +4295,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file0.zip</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>54</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/0.html</url>
+ <pageTitle />
+ <pageIdAction>7</pageIdAction>
+
+ <pageId>55</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>36</pageId>
+ <pageId>56</pageId>
<eventCategory>Cat0</eventCategory>
<eventAction>Action0</eventAction>
<eventName>Name0</eventName>
@@ -4076,10 +4352,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -4143,9 +4419,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4158,35 +4431,35 @@
<visitIp>137.82.130.0</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>41</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>41</pageId>
+ <pageId>63</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>63</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>42</pageId>
+ <pageId>64</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -4209,13 +4482,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file0.zip</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>65</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/0.html</url>
+ <pageTitle />
+ <pageIdAction>7</pageIdAction>
+
+ <pageId>66</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>43</pageId>
+ <pageId>67</pageId>
<eventCategory>Cat0</eventCategory>
<eventAction>Action0</eventAction>
<eventName>Name0</eventName>
@@ -4242,10 +4539,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -4301,9 +4598,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4316,35 +4610,35 @@
<visitIp>151.100.101.92</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>55</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>55</pageId>
+ <pageId>85</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>85</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>56</pageId>
+ <pageId>86</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -4367,13 +4661,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file0.zip</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>87</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/0.html</url>
+ <pageTitle />
+ <pageIdAction>7</pageIdAction>
+
+ <pageId>88</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>57</pageId>
+ <pageId>89</pageId>
<eventCategory>Cat0</eventCategory>
<eventAction>Action0</eventAction>
<eventName>Name0</eventName>
@@ -4400,10 +4718,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -4467,9 +4785,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4599,9 +4914,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4619,7 +4931,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>33</goalPageId>
+ <goalPageId>51</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -4631,7 +4943,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>33</pageId>
+ <pageId>51</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4731,9 +5043,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4751,7 +5060,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>40</goalPageId>
+ <goalPageId>62</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -4763,7 +5072,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>40</pageId>
+ <pageId>62</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4863,9 +5172,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
@@ -4883,7 +5189,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>54</goalPageId>
+ <goalPageId>84</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -4895,7 +5201,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>54</pageId>
+ <pageId>84</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -4995,9 +5301,6 @@
<pluginName>java</pluginName>
</row>
</pluginsIcons>
- <provider>Unknown</provider>
- <providerName>Unknown</providerName>
- <providerUrl />
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
index 3dfaf6b4fe..7a365ca3af 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>1</row>
- <row>3</row>
- <row>2</row>
+ <row>5</row>
+ <row>4</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index e2373a1ef1..602805c283 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>27</nb_visits>
- <nb_actions>47</nb_actions>
+ <nb_actions>73</nb_actions>
<nb_visits_converted>27</nb_visits_converted>
<bounce_count>14</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>607</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>780</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index e2373a1ef1..602805c283 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>27</nb_visits>
- <nb_actions>47</nb_actions>
+ <nb_actions>73</nb_actions>
<nb_visits_converted>27</nb_visits_converted>
<bounce_count>14</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>607</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>780</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
index 0dadc8d4ed..02d91d0e9c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>10</nb_visits>
- <nb_actions>18</nb_actions>
+ <nb_actions>28</nb_actions>
<nb_visits_converted>10</nb_visits_converted>
<bounce_count>5</bounce_count>
- <sum_visit_length>6305</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>8105</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.8</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
index 7c7cc211dd..c8839b7ab5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>20</nb_visits>
- <nb_actions>36</nb_actions>
+ <nb_actions>56</nb_actions>
<nb_visits_converted>20</nb_visits_converted>
<bounce_count>10</bounce_count>
- <sum_visit_length>12610</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>16210</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.8</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
index 0dadc8d4ed..02d91d0e9c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>10</nb_visits>
- <nb_actions>18</nb_actions>
+ <nb_actions>28</nb_actions>
<nb_visits_converted>10</nb_visits_converted>
<bounce_count>5</bounce_count>
- <sum_visit_length>6305</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>8105</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.8</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
index 47eec1002c..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>30</nb_visits>
- <nb_actions>50</nb_actions>
+ <nb_actions>76</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>17</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>546</avg_time_on_site>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>702</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
index 47eec1002c..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>30</nb_visits>
- <nb_actions>50</nb_actions>
+ <nb_actions>76</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>17</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>546</avg_time_on_site>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>702</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
index 47eec1002c..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>30</nb_visits>
- <nb_actions>50</nb_actions>
+ <nb_actions>76</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>17</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>546</avg_time_on_site>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>702</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
index e0144ec833..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>9</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_actions>45</nb_actions>
<nb_visits_converted>9</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>11349</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>14589</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>3</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
index e0144ec833..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>9</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_actions>45</nb_actions>
<nb_visits_converted>9</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>11349</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>14589</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>3</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
index d4214faba0..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>7</nb_visits>
- <nb_actions>10</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>7</nb_visits_converted>
<bounce_count>4</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>540</avg_time_on_site>
+ <nb_actions_per_visit>2.3</nb_actions_per_visit>
+ <avg_time_on_site>695</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
index d4214faba0..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>7</nb_visits>
- <nb_actions>10</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>7</nb_visits_converted>
<bounce_count>4</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>540</avg_time_on_site>
+ <nb_actions_per_visit>2.3</nb_actions_per_visit>
+ <avg_time_on_site>695</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
index d4214faba0..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>7</nb_visits>
- <nb_actions>10</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>7</nb_visits_converted>
<bounce_count>4</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>57%</bounce_rate>
- <nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>540</avg_time_on_site>
+ <nb_actions_per_visit>2.3</nb_actions_per_visit>
+ <avg_time_on_site>695</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
index a0db0ecba0..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>17</nb_visits>
- <nb_actions>43</nb_actions>
+ <nb_actions>77</nb_actions>
<nb_visits_converted>17</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2.5</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4.5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
index a0db0ecba0..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>17</nb_visits>
- <nb_actions>43</nb_actions>
+ <nb_actions>77</nb_actions>
<nb_visits_converted>17</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2.5</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4.5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
index a0db0ecba0..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>17</nb_visits>
- <nb_actions>43</nb_actions>
+ <nb_actions>77</nb_actions>
<nb_visits_converted>17</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2.5</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4.5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
index 5d07770e4e..3ce6d98183 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
+ <nb_actions>74</nb_actions>
<nb_visits_converted>28</nb_visits_converted>
<bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <nb_actions_per_visit>2.6</nb_actions_per_visit>
+ <avg_time_on_site>753</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
index 1922b24059..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>4</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
index 1922b24059..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>4</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
index 1922b24059..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>4</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>4</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
index 5d07770e4e..3ce6d98183 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
+ <nb_actions>74</nb_actions>
<nb_visits_converted>28</nb_visits_converted>
<bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <nb_actions_per_visit>2.6</nb_actions_per_visit>
+ <avg_time_on_site>753</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
index e023a89081..789c2c6fd1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>6</nb_visits_converted>
<bounce_count>3</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index 5d07770e4e..3ce6d98183 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
+ <nb_actions>74</nb_actions>
<nb_visits_converted>28</nb_visits_converted>
<bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <nb_actions_per_visit>2.6</nb_actions_per_visit>
+ <avg_time_on_site>753</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
index 5d07770e4e..3ce6d98183 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
+ <nb_actions>74</nb_actions>
<nb_visits_converted>28</nb_visits_converted>
<bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>21073</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <nb_actions_per_visit>2.6</nb_actions_per_visit>
+ <avg_time_on_site>753</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
index 162ce8a72b..4d3c877fce 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>http://piwik.net/space/quest/iv</row>
<row>http://piwik.net/grue/lair</row>
+ <row>http://piwik.net/space/quest/iv</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
index a0db0ecba0..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>17</nb_visits>
- <nb_actions>43</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
- <bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>2.5</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_visits>18</nb_visits>
+ <nb_actions>18</nb_actions>
+ <nb_visits_converted>18</nb_visits_converted>
+ <bounce_count>18</bounce_count>
+ <sum_visit_length>0</sum_visit_length>
+ <max_actions>1</max_actions>
+ <bounce_rate>100%</bounce_rate>
+ <nb_actions_per_visit>1</nb_actions_per_visit>
+ <avg_time_on_site>0</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
index ce18f5b1dc..d21dc7e9e9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>34</nb_visits>
- <nb_actions>60</nb_actions>
+ <nb_actions>94</nb_actions>
<nb_visits_converted>34</nb_visits_converted>
<bounce_count>17</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.8</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
index e023a89081..789c2c6fd1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
+ <nb_actions>16</nb_actions>
<nb_visits_converted>6</nb_visits_converted>
<bounce_count>3</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
index f52326b337..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>35</nb_visits>
- <nb_actions>61</nb_actions>
+ <nb_actions>95</nb_actions>
<nb_visits_converted>35</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>51%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>612</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>787</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
index 410df64fa3..7c9bf3fd36 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>26</nb_visits>
- <nb_actions>34</nb_actions>
+ <nb_actions>50</nb_actions>
<nb_visits_converted>26</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>10088</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>12968</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>69%</bounce_rate>
- <nb_actions_per_visit>1.3</nb_actions_per_visit>
- <avg_time_on_site>388</avg_time_on_site>
+ <nb_actions_per_visit>1.9</nb_actions_per_visit>
+ <avg_time_on_site>499</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
index e0144ec833..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>9</nb_visits>
- <nb_actions>27</nb_actions>
+ <nb_actions>45</nb_actions>
<nb_visits_converted>9</nb_visits_converted>
<bounce_count>0</bounce_count>
- <sum_visit_length>11349</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>14589</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>3</nb_actions_per_visit>
- <avg_time_on_site>1261</avg_time_on_site>
+ <nb_actions_per_visit>5</nb_actions_per_visit>
+ <avg_time_on_site>1621</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
index f52326b337..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>35</nb_visits>
- <nb_actions>61</nb_actions>
+ <nb_actions>95</nb_actions>
<nb_visits_converted>35</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>51%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>612</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>787</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
index f52326b337..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>35</nb_visits>
- <nb_actions>61</nb_actions>
+ <nb_actions>95</nb_actions>
<nb_visits_converted>35</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>51%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>612</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>787</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
index ce025f0a46..1d724e8969 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>30</nb_visits>
- <nb_actions>56</nb_actions>
+ <nb_actions>90</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>13</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>43%</bounce_rate>
- <nb_actions_per_visit>1.9</nb_actions_per_visit>
- <avg_time_on_site>715</avg_time_on_site>
+ <nb_actions_per_visit>3</nb_actions_per_visit>
+ <avg_time_on_site>919</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
index 66dead530e..829f7602ef 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>0</row>
- <row>1261</row>
+ <row>1621</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
index f52326b337..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>35</nb_visits>
- <nb_actions>61</nb_actions>
+ <nb_actions>95</nb_actions>
<nb_visits_converted>35</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>51%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>612</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>787</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
index 352cc69e4a..c07d0eb617 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_actions>7</nb_actions>
<nb_visits_converted>3</nb_visits_converted>
<bounce_count>2</bounce_count>
- <sum_visit_length>1261</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>67%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>420</avg_time_on_site>
+ <nb_actions_per_visit>2.3</nb_actions_per_visit>
+ <avg_time_on_site>540</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
index f52326b337..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>35</nb_visits>
- <nb_actions>61</nb_actions>
+ <nb_actions>95</nb_actions>
<nb_visits_converted>35</nb_visits_converted>
<bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>51%</bounce_rate>
- <nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>612</avg_time_on_site>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>787</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
index 64efc881e1..1f4bd3c02b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
+ <nb_actions>5</nb_actions>
<nb_visits_converted>2</nb_visits_converted>
<bounce_count>1</bounce_count>
- <sum_visit_length>1261</sum_visit_length>
- <max_actions>2</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>1.5</nb_actions_per_visit>
- <avg_time_on_site>631</avg_time_on_site>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
index ce025f0a46..1d724e8969 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>30</nb_visits>
- <nb_actions>56</nb_actions>
+ <nb_actions>90</nb_actions>
<nb_visits_converted>30</nb_visits_converted>
<bounce_count>13</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
- <max_actions>3</max_actions>
+ <sum_visit_length>27557</sum_visit_length>
+ <max_actions>5</max_actions>
<bounce_rate>43%</bounce_rate>
- <nb_actions_per_visit>1.9</nb_actions_per_visit>
- <avg_time_on_site>715</avg_time_on_site>
+ <nb_actions_per_visit>3</nb_actions_per_visit>
+ <avg_time_on_site>919</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
index 4541e8b425..805794b25a 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
@@ -6,35 +6,35 @@
<visitIp>1.2.4.8</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>30</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>30</pageId>
+ <pageId>46</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>46</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>31</pageId>
+ <pageId>47</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -57,13 +57,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file8.zip</url>
+ <pageTitle />
+ <pageIdAction>46</pageIdAction>
+
+ <pageId>48</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/8.html</url>
+ <pageTitle />
+ <pageIdAction>47</pageIdAction>
+
+ <pageId>49</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>32</pageId>
+ <pageId>50</pageId>
<eventCategory>Cat8</eventCategory>
<eventAction>Action8</eventAction>
<eventName>Name8</eventName>
@@ -90,10 +114,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -174,7 +198,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>29</goalPageId>
+ <goalPageId>45</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -186,7 +210,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>29</pageId>
+ <pageId>45</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -298,28 +322,28 @@
<visitIp>1.2.4.7</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>27</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>27</pageId>
+ <pageId>41</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>41</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -331,13 +355,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file7.zip</url>
+ <pageTitle />
+ <pageIdAction>41</pageIdAction>
+
+ <pageId>42</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/7.html</url>
+ <pageTitle />
+ <pageIdAction>42</pageIdAction>
+
+ <pageId>43</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>28</pageId>
+ <pageId>44</pageId>
<eventCategory>Cat7</eventCategory>
<eventAction>Action7</eventAction>
<eventName>Name7</eventName>
@@ -364,10 +412,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
index 62c0a5aafc..0f2d97047a 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
@@ -11,7 +11,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>26</goalPageId>
+ <goalPageId>40</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -23,7 +23,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>26</pageId>
+ <pageId>40</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -135,35 +135,35 @@
<visitIp>1.2.4.6</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>23</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>23</pageId>
+ <pageId>35</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>35</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>36</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -186,13 +186,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file6.zip</url>
+ <pageTitle />
+ <pageIdAction>36</pageIdAction>
+
+ <pageId>37</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/6.html</url>
+ <pageTitle />
+ <pageIdAction>37</pageIdAction>
+
+ <pageId>38</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>39</pageId>
<eventCategory>Cat6</eventCategory>
<eventAction>Action6</eventAction>
<eventName>Name6</eventName>
@@ -219,10 +243,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -303,7 +327,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>22</goalPageId>
+ <goalPageId>34</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -315,7 +339,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>22</pageId>
+ <pageId>34</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 8d3cad0ef0..3e3259cb3d 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -11,7 +11,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>61</goalPageId>
+ <goalPageId>95</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -23,7 +23,7 @@
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>61</pageId>
+ <pageId>95</pageId>
<icon />
</row>
@@ -117,35 +117,35 @@
<visitIp>1.2.4.8</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>30</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>30</pageId>
+ <pageId>46</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>46</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>31</pageId>
+ <pageId>47</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -168,13 +168,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file8.zip</url>
+ <pageTitle />
+ <pageIdAction>46</pageIdAction>
+
+ <pageId>48</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/8.html</url>
+ <pageTitle />
+ <pageIdAction>47</pageIdAction>
+
+ <pageId>49</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>32</pageId>
+ <pageId>50</pageId>
<eventCategory>Cat8</eventCategory>
<eventAction>Action8</eventAction>
<eventName>Name8</eventName>
@@ -201,10 +225,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -285,7 +309,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>29</goalPageId>
+ <goalPageId>45</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -297,7 +321,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>29</pageId>
+ <pageId>45</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -409,28 +433,28 @@
<visitIp>1.2.4.7</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>27</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>27</pageId>
+ <pageId>41</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>41</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -442,13 +466,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file7.zip</url>
+ <pageTitle />
+ <pageIdAction>41</pageIdAction>
+
+ <pageId>42</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/7.html</url>
+ <pageTitle />
+ <pageIdAction>42</pageIdAction>
+
+ <pageId>43</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>28</pageId>
+ <pageId>44</pageId>
<eventCategory>Cat7</eventCategory>
<eventAction>Action7</eventAction>
<eventName>Name7</eventName>
@@ -475,10 +523,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -559,7 +607,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>26</goalPageId>
+ <goalPageId>40</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -571,7 +619,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>26</pageId>
+ <pageId>40</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -683,35 +731,35 @@
<visitIp>1.2.4.6</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>23</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>23</pageId>
+ <pageId>35</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>35</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>36</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -734,13 +782,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file6.zip</url>
+ <pageTitle />
+ <pageIdAction>36</pageIdAction>
+
+ <pageId>37</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/6.html</url>
+ <pageTitle />
+ <pageIdAction>37</pageIdAction>
+
+ <pageId>38</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>39</pageId>
<eventCategory>Cat6</eventCategory>
<eventAction>Action6</eventAction>
<eventName>Name6</eventName>
@@ -767,10 +839,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -851,7 +923,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>22</goalPageId>
+ <goalPageId>34</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -863,7 +935,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>22</pageId>
+ <pageId>34</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 8d3cad0ef0..3e3259cb3d 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -11,7 +11,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>61</goalPageId>
+ <goalPageId>95</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -23,7 +23,7 @@
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>61</pageId>
+ <pageId>95</pageId>
<icon />
</row>
@@ -117,35 +117,35 @@
<visitIp>1.2.4.8</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>30</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>30</pageId>
+ <pageId>46</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>46</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>31</pageId>
+ <pageId>47</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -168,13 +168,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file8.zip</url>
+ <pageTitle />
+ <pageIdAction>46</pageIdAction>
+
+ <pageId>48</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/8.html</url>
+ <pageTitle />
+ <pageIdAction>47</pageIdAction>
+
+ <pageId>49</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>32</pageId>
+ <pageId>50</pageId>
<eventCategory>Cat8</eventCategory>
<eventAction>Action8</eventAction>
<eventName>Name8</eventName>
@@ -201,10 +225,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -285,7 +309,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>29</goalPageId>
+ <goalPageId>45</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -297,7 +321,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>29</pageId>
+ <pageId>45</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -409,28 +433,28 @@
<visitIp>1.2.4.7</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>27</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>27</pageId>
+ <pageId>41</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>41</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -442,13 +466,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file7.zip</url>
+ <pageTitle />
+ <pageIdAction>41</pageIdAction>
+
+ <pageId>42</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/7.html</url>
+ <pageTitle />
+ <pageIdAction>42</pageIdAction>
+
+ <pageId>43</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>28</pageId>
+ <pageId>44</pageId>
<eventCategory>Cat7</eventCategory>
<eventAction>Action7</eventAction>
<eventName>Name7</eventName>
@@ -475,10 +523,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -559,7 +607,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>26</goalPageId>
+ <goalPageId>40</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -571,7 +619,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>26</pageId>
+ <pageId>40</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -683,35 +731,35 @@
<visitIp>1.2.4.6</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>23</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>23</pageId>
+ <pageId>35</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>35</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>36</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -734,13 +782,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file6.zip</url>
+ <pageTitle />
+ <pageIdAction>36</pageIdAction>
+
+ <pageId>37</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/6.html</url>
+ <pageTitle />
+ <pageIdAction>37</pageIdAction>
+
+ <pageId>38</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>39</pageId>
<eventCategory>Cat6</eventCategory>
<eventAction>Action6</eventAction>
<eventName>Name6</eventName>
@@ -767,10 +839,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -851,7 +923,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>22</goalPageId>
+ <goalPageId>34</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -863,7 +935,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>22</pageId>
+ <pageId>34</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index fa118700a7..03318743cc 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -11,7 +11,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>61</goalPageId>
+ <goalPageId>95</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -23,7 +23,7 @@
<pageTitle>It&#039;s pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>61</pageId>
+ <pageId>95</pageId>
<icon />
</row>
@@ -117,35 +117,35 @@
<visitIp>1.2.4.8</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>30</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>30</pageId>
+ <pageId>46</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>46</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>31</pageId>
+ <pageId>47</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -168,13 +168,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file8.zip</url>
+ <pageTitle />
+ <pageIdAction>46</pageIdAction>
+
+ <pageId>48</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/8.html</url>
+ <pageTitle />
+ <pageIdAction>47</pageIdAction>
+
+ <pageId>49</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>32</pageId>
+ <pageId>50</pageId>
<eventCategory>Cat8</eventCategory>
<eventAction>Action8</eventAction>
<eventName>Name8</eventName>
@@ -201,10 +225,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -285,7 +309,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>29</goalPageId>
+ <goalPageId>45</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -297,7 +321,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>29</pageId>
+ <pageId>45</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -409,28 +433,28 @@
<visitIp>1.2.4.7</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>27</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>27</pageId>
+ <pageId>41</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>41</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -442,13 +466,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file7.zip</url>
+ <pageTitle />
+ <pageIdAction>41</pageIdAction>
+
+ <pageId>42</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/7.html</url>
+ <pageTitle />
+ <pageIdAction>42</pageIdAction>
+
+ <pageId>43</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>28</pageId>
+ <pageId>44</pageId>
<eventCategory>Cat7</eventCategory>
<eventAction>Action7</eventAction>
<eventName>Name7</eventName>
@@ -475,10 +523,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -559,7 +607,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>26</goalPageId>
+ <goalPageId>40</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -571,7 +619,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>26</pageId>
+ <pageId>40</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -683,35 +731,35 @@
<visitIp>1.2.4.6</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>23</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>23</pageId>
+ <pageId>35</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>35</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>24</pageId>
+ <pageId>36</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -734,13 +782,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file6.zip</url>
+ <pageTitle />
+ <pageIdAction>36</pageIdAction>
+
+ <pageId>37</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/6.html</url>
+ <pageTitle />
+ <pageIdAction>37</pageIdAction>
+
+ <pageId>38</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>25</pageId>
+ <pageId>39</pageId>
<eventCategory>Cat6</eventCategory>
<eventAction>Action6</eventAction>
<eventName>Name6</eventName>
@@ -767,10 +839,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -851,7 +923,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>22</goalPageId>
+ <goalPageId>34</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -863,7 +935,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>22</pageId>
+ <pageId>34</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -975,28 +1047,28 @@
<visitIp>1.2.4.5</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>20</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>20</pageId>
+ <pageId>30</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>30</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>goal</type>
@@ -1008,13 +1080,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file5.zip</url>
+ <pageTitle />
+ <pageIdAction>31</pageIdAction>
+
+ <pageId>31</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/5.html</url>
+ <pageTitle />
+ <pageIdAction>32</pageIdAction>
+
+ <pageId>32</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>21</pageId>
+ <pageId>33</pageId>
<eventCategory>Cat5</eventCategory>
<eventAction>Action5</eventAction>
<eventName>Name5</eventName>
@@ -1041,10 +1137,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>0</searches>
- <actions>2</actions>
+ <actions>4</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
@@ -1125,7 +1221,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>19</goalPageId>
+ <goalPageId>29</goalPageId>
<url>http://piwik.net/grue/lair</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -1137,7 +1233,7 @@
<pageTitle>It&#039;s <script> pitch black...</pageTitle>
<pageIdAction>2</pageIdAction>
- <pageId>19</pageId>
+ <pageId>29</pageId>
<customVariables>
<row>
<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
@@ -1249,35 +1345,35 @@
<visitIp>1.2.4.4</visitIp>
<actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>16</goalPageId>
-
- <url>http://piwik.net/space/quest/iv</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
<row>
<type>action</type>
<url>http://piwik.net/space/quest/iv</url>
<pageTitle>Space Quest XII</pageTitle>
<pageIdAction>4</pageIdAction>
- <pageId>16</pageId>
+ <pageId>24</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>24</goalPageId>
+
+ <url>http://piwik.net/space/quest/iv</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
</row>
<row>
<type>search</type>
<url />
<pageIdAction />
- <pageId>17</pageId>
+ <pageId>25</pageId>
<customVariables>
<row>
<customVariablePageName4>Search Category</customVariablePageName4>
@@ -1300,13 +1396,37 @@
<url>http://piwik.net/space/quest/iv</url>
<icon>plugins/Morpheus/images/goal.png</icon>
+ </row>
+ <row>
+ <type>download</type>
+ <url>http://example.org/path/file4.zip</url>
+ <pageTitle />
+ <pageIdAction>26</pageIdAction>
+
+ <pageId>26</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/download.png</icon>
+
+ </row>
+ <row>
+ <type>outlink</type>
+ <url>http://example-outlink.org/4.html</url>
+ <pageTitle />
+ <pageIdAction>27</pageIdAction>
+
+ <pageId>27</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
</row>
<row>
<type>event</type>
<url>http://piwik.net/space/quest/iv</url>
<pageIdAction>4</pageIdAction>
- <pageId>18</pageId>
+ <pageId>28</pageId>
<eventCategory>Cat4</eventCategory>
<eventAction>Action4</eventAction>
<eventName>Name4</eventName>
@@ -1333,10 +1453,10 @@
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>100</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
- <visitDuration>1261</visitDuration>
- <visitDurationPretty>21 min 1s</visitDurationPretty>
+ <visitDuration>1621</visitDuration>
+ <visitDurationPretty>27 min 1s</visitDurationPretty>
<searches>1</searches>
- <actions>3</actions>
+ <actions>5</actions>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 3a836ebd0d..f9f34d09f3 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Unknown</label>
<nb_visits>8</nb_visits>
- <nb_actions>15</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>5044</sum_visit_length>
+ <nb_actions>23</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
<bounce_count>4</bounce_count>
<goals>
<row idgoal='1'>
@@ -34,9 +34,9 @@
<row>
<label>Vancouver, British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -67,9 +67,9 @@
<row>
<label>Stratford-upon-Avon, Warwickshire, United Kingdom</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -100,9 +100,9 @@
<row>
<label>Besançon, Franche-Comte, France</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -133,9 +133,9 @@
<row>
<label>Hluboká nad Vltavou, Saint Petersburg City, Russia</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -164,9 +164,9 @@
<row>
<label>Lhasa, Unknown, Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -197,9 +197,9 @@
<row>
<label>London, London, City of, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -228,9 +228,9 @@
<row>
<label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -259,9 +259,9 @@
<row>
<label>Stratford-upon-Avon, Kent, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -290,9 +290,9 @@
<row>
<label>Stratford-upon-Avon, Miravci, Macedonia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -321,9 +321,9 @@
<row>
<label>Stratford-upon-Avon, Saint Petersburg City, Russia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
index a608b58f48..0569de72bd 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Europe</label>
<nb_visits>20</nb_visits>
- <nb_actions>36</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>12610</sum_visit_length>
+ <nb_actions>56</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>16210</sum_visit_length>
<bounce_count>10</bounce_count>
<goals>
<row idgoal='1'>
@@ -28,9 +28,9 @@
<row>
<label>North America</label>
<nb_visits>9</nb_visits>
- <nb_actions>15</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>5044</sum_visit_length>
+ <nb_actions>23</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
<bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
@@ -53,9 +53,9 @@
<row>
<label>Asia</label>
<nb_visits>4</nb_visits>
- <nb_actions>6</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>10</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -78,9 +78,9 @@
<row>
<label>Unknown</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 235a0e73c5..82341bda26 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>United Kingdom</label>
<nb_visits>10</nb_visits>
- <nb_actions>18</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>6305</sum_visit_length>
+ <nb_actions>28</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>8105</sum_visit_length>
<bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -61,9 +61,9 @@
<row>
<label>Russia</label>
<nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>11</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -90,9 +90,9 @@
<row>
<label>United States</label>
<nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>7</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -119,9 +119,9 @@
<row>
<label>France</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -148,9 +148,9 @@
<row>
<label>Indonesia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -177,9 +177,9 @@
<row>
<label>Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -206,9 +206,9 @@
<row>
<label>Macedonia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -235,9 +235,9 @@
<row>
<label>Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -264,9 +264,9 @@
<row>
<label>Unknown</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index 97f6f058e2..8d74035038 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Unknown</label>
<nb_visits>8</nb_visits>
- <nb_actions>15</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>5044</sum_visit_length>
+ <nb_actions>23</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>6484</sum_visit_length>
<bounce_count>4</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -62,9 +62,9 @@
<row>
<label>Warwickshire, United Kingdom</label>
<nb_visits>6</nb_visits>
- <nb_actions>11</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>17</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
@@ -92,9 +92,9 @@
<row>
<label>Saint Petersburg City, Russia</label>
<nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>11</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -122,9 +122,9 @@
<row>
<label>Franche-Comte, France</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -152,9 +152,9 @@
<row>
<label>Kent, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -182,9 +182,9 @@
<row>
<label>London, City of, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -212,9 +212,9 @@
<row>
<label>Miravci, Macedonia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -242,9 +242,9 @@
<row>
<label>Unknown, Tibet</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml
index f7f1eb94b6..f3a9d2a67c 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>United Kingdom</label>
<nb_visits>10</nb_visits>
- <nb_actions>18</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>6305</sum_visit_length>
+ <nb_actions>28</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>8105</sum_visit_length>
<bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
index fa25ca307f..312160ddd2 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Stratford-upon-Avon, Warwickshire, United Kingdom</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
index 0d795a3fdc..d805e35af8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Europe</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
index 3fae74571b..14cb04d3d7 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>United Kingdom</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
index 673c09f94d..eb777c4f04 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Warwickshire, United Kingdom</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
index 022ae3c7fe..c8d94aac7e 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>United Kingdom</label>
<nb_visits>10</nb_visits>
- <nb_actions>18</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>6305</sum_visit_length>
+ <nb_actions>28</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>8105</sum_visit_length>
<bounce_count>5</bounce_count>
<goals>
<row idgoal='1'>
@@ -32,9 +32,9 @@
<row>
<label>Russia</label>
<nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>11</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -61,9 +61,9 @@
<row>
<label>France</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -90,9 +90,9 @@
<row>
<label>Italy</label>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
@@ -119,9 +119,9 @@
<row>
<label>Macedonia</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
index b64ec6a819..092f2c0db8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Vancouver, British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
index 6f06048a7f..0fa12f42c6 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
@@ -3,9 +3,9 @@
<row>
<label>North America</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
index 211b3504c1..e4b7c8e8ff 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
index 3fdca68028..dc4bb6c0af 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
@@ -3,9 +3,9 @@
<row>
<label>British Columbia, Canada</label>
<nb_visits>6</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>16</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
index 57d7264bdc..aefcded3e8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Stratford-upon-Avon, Warwickshire, United Kingdom</label>
<nb_visits>4</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2522</sum_visit_length>
+ <nb_actions>12</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>3242</sum_visit_length>
<bounce_count>2</bounce_count>
<goals>
<row idgoal='1'>
@@ -36,9 +36,9 @@
<row>
<label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label>
<nb_visits>2</nb_visits>
- <nb_actions>3</nb_actions>
- <max_actions>2</max_actions>
- <sum_visit_length>1261</sum_visit_length>
+ <nb_actions>5</nb_actions>
+ <max_actions>4</max_actions>
+ <sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
index b5566a46cd..e0af0dd2f0 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Europe</label>
<nb_visits>6</nb_visits>
- <nb_actions>11</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>17</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
index a1e694906d..69cd5479ef 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
@@ -3,9 +3,9 @@
<row>
<label>United Kingdom</label>
<nb_visits>6</nb_visits>
- <nb_actions>11</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>17</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
index 04e7049815..7dc6b84073 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
@@ -3,9 +3,9 @@
<row>
<label>Warwickshire, United Kingdom</label>
<nb_visits>6</nb_visits>
- <nb_actions>11</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>3783</sum_visit_length>
+ <nb_actions>17</nb_actions>
+ <max_actions>5</max_actions>
+ <sum_visit_length>4863</sum_visit_length>
<bounce_count>3</bounce_count>
<goals>
<row idgoal='1'>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
index c58ffd2837..8ba7f648bd 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
@@ -60,11 +60,11 @@
<reportMetadata>
<row>
- <idsubdatatable>2687</idsubdatatable>
+ <idsubdatatable>2711</idsubdatatable>
</row>
<row>
- <idsubdatatable>2688</idsubdatatable>
+ <idsubdatatable>2712</idsubdatatable>
</row>
</reportMetadata>
<reportTotal>
@@ -72,7 +72,7 @@
<nb_hits>8</nb_hits>
<entry_bounce_count>4</entry_bounce_count>
<entry_nb_visits>8</entry_nb_visits>
- <entry_nb_actions>16</entry_nb_actions>
+ <entry_nb_actions>24</entry_nb_actions>
<exit_nb_visits>4</exit_nb_visits>
</reportTotal>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
index 8bbb36e201..02d9471f31 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
@@ -57,11 +57,11 @@
<label>12h</label>
<nb_uniq_visitors>4</nb_uniq_visitors>
<nb_visits>4</nb_visits>
- <nb_actions>12</nb_actions>
+ <nb_actions>20</nb_actions>
<nb_users>0</nb_users>
<revenue>$ 40</revenue>
- <nb_actions_per_visit>3</nb_actions_per_visit>
- <avg_time_on_site>00:21:01</avg_time_on_site>
+ <nb_actions_per_visit>5</nb_actions_per_visit>
+ <avg_time_on_site>00:27:01</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
</row>
<row>
@@ -395,7 +395,7 @@
<reportTotal>
<nb_visits>8</nb_visits>
<nb_uniq_visitors>8</nb_uniq_visitors>
- <nb_actions>16</nb_actions>
+ <nb_actions>24</nb_actions>
<nb_visits_converted>0</nb_visits_converted>
<bounce_count>4</bounce_count>
<nb_conversions>12</nb_conversions>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index d124b5bba9..a8376a8758 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -413,6 +413,12 @@
<name>Custom Variable value 5 (scope visit)</name>
<segment>customVariableValue5</segment>
</row>
+ <row>
+ <type>dimension</type>
+ <category>Actions</category>
+ <name>Clicked URL</name>
+ <segment>outlinkUrl</segment>
+ </row>
<row>
<type>dimension</type>
<category>Actions</category>
@@ -434,6 +440,12 @@
<segment>contentTarget</segment>
<acceptedValues>For instance the URL of a landing page: "http://landingpage.example.com"</acceptedValues>
</row>
+ <row>
+ <type>dimension</type>
+ <category>Actions</category>
+ <name>Download URL</name>
+ <segment>downloadUrl</segment>
+ </row>
<row>
<type>dimension</type>
<category>Actions</category>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
index 8ab9bdb0ca..ace4b75be7 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
@@ -58,6 +58,7 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://cloudsite5.com/20/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F20%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/24/download</label>
@@ -73,6 +74,7 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://cloudsite6.com/24/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F24%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/28/download</label>
@@ -88,5 +90,6 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://cloudsite7.com/28/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
index 2208900c16..20b7d82400 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
@@ -58,6 +58,7 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://othersite10.com/</url>
+ <segment>outlinkUrl==http%3A%2F%2Fothersite10.com%2F</segment>
</row>
<row>
<label>othersite11.com/</label>
@@ -73,6 +74,7 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://othersite11.com/</url>
+ <segment>outlinkUrl==http%3A%2F%2Fothersite11.com%2F</segment>
</row>
<row>
<label>othersite12.com/</label>
@@ -88,5 +90,6 @@
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
<url>http://othersite12.com/</url>
+ <segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
index d91a3e6444..ae8e9590d0 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
@@ -14,6 +14,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite5.com/20/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F20%2Fdownload</segment>
</row>
<row>
<label>cloudsite5.com/21/download</label>
@@ -29,6 +30,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite5.com/21/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F21%2Fdownload</segment>
</row>
<row>
<label>cloudsite5.com/22/download</label>
@@ -44,6 +46,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite5.com/22/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F22%2Fdownload</segment>
</row>
<row>
<label>cloudsite5.com/23/download</label>
@@ -59,6 +62,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite5.com/23/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F23%2Fdownload</segment>
</row>
<row>
<label>cloudsite5.com/download</label>
@@ -74,6 +78,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite5.com/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/24/download</label>
@@ -89,6 +94,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite6.com/24/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F24%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/25/download</label>
@@ -104,6 +110,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite6.com/25/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F25%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/26/download</label>
@@ -119,6 +126,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite6.com/26/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F26%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/27/download</label>
@@ -134,6 +142,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite6.com/27/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F27%2Fdownload</segment>
</row>
<row>
<label>cloudsite6.com/download</label>
@@ -149,6 +158,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite6.com/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/28/download</label>
@@ -164,6 +174,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite7.com/28/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/29/download</label>
@@ -179,6 +190,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite7.com/29/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F29%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/30/download</label>
@@ -194,6 +206,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite7.com/30/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F30%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/31/download</label>
@@ -209,6 +222,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite7.com/31/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F31%2Fdownload</segment>
</row>
<row>
<label>cloudsite7.com/download</label>
@@ -224,6 +238,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite7.com/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2Fdownload</segment>
</row>
<row>
<label>cloudsite8.com/32/download</label>
@@ -239,6 +254,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite8.com/32/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F32%2Fdownload</segment>
</row>
<row>
<label>cloudsite8.com/33/download</label>
@@ -254,6 +270,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite8.com/33/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F33%2Fdownload</segment>
</row>
<row>
<label>cloudsite8.com/34/download</label>
@@ -269,6 +286,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite8.com/34/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F34%2Fdownload</segment>
</row>
<row>
<label>cloudsite8.com/35/download</label>
@@ -284,6 +302,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite8.com/35/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F35%2Fdownload</segment>
</row>
<row>
<label>cloudsite8.com/download</label>
@@ -299,6 +318,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite8.com/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2Fdownload</segment>
</row>
<row>
<label>cloudsite9.com/36/download</label>
@@ -314,6 +334,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite9.com/36/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F36%2Fdownload</segment>
</row>
<row>
<label>cloudsite9.com/37/download</label>
@@ -329,6 +350,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite9.com/37/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F37%2Fdownload</segment>
</row>
<row>
<label>cloudsite9.com/38/download</label>
@@ -344,6 +366,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite9.com/38/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F38%2Fdownload</segment>
</row>
<row>
<label>cloudsite9.com/39/download</label>
@@ -359,6 +382,7 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite9.com/39/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F39%2Fdownload</segment>
</row>
<row>
<label>cloudsite9.com/download</label>
@@ -374,5 +398,6 @@
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<url>http://cloudsite9.com/download</url>
+ <segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2Fdownload</segment>
</row>
</result>
\ No newline at end of file
--
GitLab