diff --git a/misc/log-analytics b/misc/log-analytics
index 39956528bb322678c8ec7ad6463787dacc637ef1..cdb7c3981e0af52ce9666a5721c52a28f16cf963 160000
--- a/misc/log-analytics
+++ b/misc/log-analytics
@@ -1 +1 @@
-Subproject commit 39956528bb322678c8ec7ad6463787dacc637ef1
+Subproject commit cdb7c3981e0af52ce9666a5721c52a28f16cf963
diff --git a/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php b/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
index 6b47e946a53d453585bd3368a29b4f2d2a5f0c3e..fa255449081dc3fb55d412d3744cad60d4429014 100644
--- a/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
+++ b/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
@@ -128,7 +128,7 @@ class DeleteLogsDataTest extends ConsoleCommandTestCase
), $options);
$this->assertEquals(0, $result, $this->getCommandDisplayOutputErrorMessage());
- $this->assertContains("Successfully deleted 15 visits", $this->applicationTester->getDisplay());
+ $this->assertContains("Successfully deleted 19 visits", $this->applicationTester->getDisplay());
}
private function setCommandInput($value)
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index f89fc4948bee413aa1e80b461124a8abbefeaa8e..8dea0417173ff7ae34b55cd4d3a40684b83004e3 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -141,6 +141,43 @@ class ManySitesImportedLogs extends Fixture
if ($this->includeApiCustomVarMapping) {
$this->logIisWithCustomFormat($mapToCustom = true);
}
+
+ $this->logWithIncludeFilters();
+ $this->logWithExcludeFilters();
+ }
+
+ private function logWithExcludeFilters()
+ {
+ $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/filter_exclude_logs.log'; # log file
+
+ $opts = array('--idsite' => $this->idSite,
+ '--enable-testmode' => false,
+ '--recorders' => '1',
+ '--recorder-max-payload-size' => '1',
+ '--exclude-host' => ['filtered1.com', 'www.filtered2.com'],
+ '--exclude-older-than' => '2012-08-09 08:10:39 +0000',
+ '--exclude-newer-than' => '2012-08-31 00:00:00 +0000');
+
+ $output = self::executeLogImporter($logFile, $opts);
+ $output = implode("\n", $output);
+
+ $this->assertContains('4 filtered log lines', $output);
+ }
+
+ private function logWithIncludeFilters()
+ {
+ $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/filter_include_logs.log'; # log file
+
+ $opts = array('--idsite' => $this->idSite,
+ '--enable-testmode' => false,
+ '--recorders' => '1',
+ '--recorder-max-payload-size' => '1',
+ '--include-host' => ['included3.com', 'www.included4.com']);
+
+ $output = self::executeLogImporter($logFile, $opts);
+ $output = implode("\n", $output);
+
+ $this->assertContains('2 filtered log lines', $output);
}
private function setupSegments()
@@ -238,16 +275,28 @@ class ManySitesImportedLogs extends Fixture
private function replayLogFile($additonalOptions = array())
{
$logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_replay.log';
+ $logFileWithHost = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_replay_host.log';
$opts = array('--login' => 'superUserLogin',
'--password' => 'superUserPass',
'--recorders' => '1',
'--recorder-max-payload-size' => '1',
- '--replay-tracking' => false);
+ '--replay-tracking' => false,
+ '--exclude-older-than' => '2012-01-01 08:10:39 +0000',
+ '--exclude-host' => ['excluded.com']);
$opts = array_merge($opts, $additonalOptions);
- self::executeLogImporter($logFile, $opts);
+ $output = self::executeLogImporter($logFile, $opts);
+ $output = implode("\n", $output);
+
+ $this->assertContains('1 filtered log lines', $output);
+
+ // test that correct logs are excluded when the host is in the log file
+ $output = self::executeLogImporter($logFileWithHost, $opts);
+ $output = implode("\n", $output);
+
+ $this->assertContains('2 filtered log lines', $output);
}
/**
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
old mode 100644
new mode 100755
index 209613d7560b9d2e1327718a728d16079f62f9a1..37a8f92b6c6374141aec085e3bc955bf33692f4e
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_uniq_visitors>11</nb_uniq_visitors>
<nb_users>0</nb_users>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>9</bounce_count>
+ <nb_visits>11</nb_visits>
+ <nb_actions>11</nb_actions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <bounce_count>11</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
old mode 100644
new mode 100755
index e36e5d53df7fd96c7c995f4656c05f321b09878e..3526826240e739b5710e13dbac7bffa5d895d026
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>28</nb_uniq_visitors>
+ <nb_uniq_visitors>33</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>28</nb_visits>
- <nb_actions>31</nb_actions>
- <nb_visits_converted>26</nb_visits_converted>
- <bounce_count>26</bounce_count>
+ <nb_visits>33</nb_visits>
+ <nb_actions>36</nb_actions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <bounce_count>31</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>93%</bounce_rate>
+ <bounce_rate>94%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>11</avg_time_on_site>
+ <avg_time_on_site>9</avg_time_on_site>
</result>
<result idSite="2">
<nb_uniq_visitors>1</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
old mode 100644
new mode 100755
index f1ce3d1ac179204096912d7d33946ca14822105d..425d6d909d2bc621d7508ae5763cdd3cf0e59053
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>26</nb_uniq_visitors>
+ <nb_uniq_visitors>30</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_visits_converted>24</nb_visits_converted>
- <bounce_count>24</bounce_count>
+ <nb_visits>30</nb_visits>
+ <nb_actions>33</nb_actions>
+ <nb_visits_converted>28</nb_visits_converted>
+ <bounce_count>28</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>92%</bounce_rate>
+ <bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>12</avg_time_on_site>
+ <avg_time_on_site>10</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
old mode 100644
new mode 100755
index 284a007a78afa4fe9865ded8a1096fbe4d4d9226..79f53c6e57ceb42780d2180482bc920fe6df5525
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_visits>29</nb_visits>
- <nb_actions>41</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>26</bounce_count>
+ <nb_visits>34</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_visits_converted>32</nb_visits_converted>
+ <bounce_count>31</bounce_count>
<sum_visit_length>359</sum_visit_length>
<max_actions>10</max_actions>
- <bounce_rate>90%</bounce_rate>
+ <bounce_rate>91%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>12</avg_time_on_site>
+ <avg_time_on_site>11</avg_time_on_site>
</result>
<result idSite="2">
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
old mode 100644
new mode 100755
index a089d95913bc2fd69fee483b759f4ae7e8f285d6..21274e2349f753707faaec42f84100c33a800e80
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
@@ -938,8 +938,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>1</idVisit>
- <visitIp>175.41.192.40</visitIp>
+ <idVisit>59</idVisit>
+ <visitIp>175.41.193.46</visitIp>
<actionDetails>
<row>
@@ -947,20 +947,20 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>1</goalPageId>
+ <goalPageId>81</goalPageId>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://www.included4.com/blog/category/meta/</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
<type>action</type>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://www.included4.com/blog/category/meta/</url>
<pageTitle />
- <pageIdAction>1</pageIdAction>
+ <pageIdAction>57</pageIdAction>
- <pageId>1</pageId>
+ <pageId>81</pageId>
<bandwidth>3574</bandwidth>
<interactionPosition>1</interactionPosition>
<icon />
@@ -1044,7 +1044,124 @@
<regionCode />
<city />
<location>Japan</location>
- <visitLocalTime>08:10:38</visitLocalTime>
+ <visitLocalTime>08:10:39</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>61</idVisit>
+ <visitIp>175.41.191.46</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>83</goalPageId>
+
+ <url>http://www.included2.com/blog/category/meta/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://www.included2.com/blog/category/meta/</url>
+ <pageTitle />
+ <pageIdAction>59</pageIdAction>
+
+
+ <pageId>83</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Singapore</country>
+ <countryCode>sg</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Singapore</location>
+ <visitLocalTime>08:10:39</visitLocalTime>
<visitLocalHour>8</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
<customVariables>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
old mode 100644
new mode 100755
index f25d013581da840725bdc7b19c2280b7109f4fd3..010256dbff691e036089f967de9f89faa82e26e2
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
@@ -335,6 +335,123 @@
<plugins />
<pluginsIcons />
</row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>62</idVisit>
+ <visitIp>175.41.191.47</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>84</goalPageId>
+
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
+ <pageTitle />
+ <pageIdAction>60</pageIdAction>
+
+
+ <pageId>84</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Singapore</country>
+ <countryCode>sg</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Singapore</location>
+ <visitLocalTime>08:10:38</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
<row>
<idSite>1</idSite>
<idVisit>27</idVisit>
@@ -1368,125 +1485,4 @@
<plugins />
<pluginsIcons />
</row>
- <row>
- <idSite>1</idSite>
- <idVisit>20</idVisit>
- <visitIp>175.41.192.41</visitIp>
-
- <actionDetails>
- <row>
- <type>goal</type>
- <goalName>all</goalName>
- <goalId>1</goalId>
- <revenue>5</revenue>
- <goalPageId>20</goalPageId>
-
- <url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url>
- <icon>plugins/Morpheus/images/goal.png</icon>
-
- </row>
- <row>
- <type>action</type>
- <url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url>
- <pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F</pageTitle>
- <pageIdAction>18</pageIdAction>
-
-
- <pageId>20</pageId>
- <bandwidth>3574</bandwidth>
- <interactionPosition>1</interactionPosition>
- <icon />
-
- <customVariables>
- <row>
- <customVariablePageName1>HTTP-code</customVariablePageName1>
- <customVariablePageValue1>404</customVariablePageValue1>
- </row>
- </customVariables>
- <bandwidth_pretty>3.5 K</bandwidth_pretty>
- </row>
- </actionDetails>
- <goalConversions>1</goalConversions>
- <siteCurrency>USD</siteCurrency>
- <siteCurrencySymbol>$</siteCurrencySymbol>
-
-
-
-
-
-
-
-
-
-
- <userId />
- <visitorType>new</visitorType>
- <visitorTypeIcon />
- <visitConverted>1</visitConverted>
- <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
- <visitCount>1</visitCount>
- <visitEcommerceStatus>none</visitEcommerceStatus>
- <visitEcommerceStatusIcon />
- <daysSinceFirstVisit>0</daysSinceFirstVisit>
- <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <visitDuration>0</visitDuration>
- <visitDurationPretty>0s</visitDurationPretty>
- <searches>0</searches>
- <actions>1</actions>
- <interactions>1</interactions>
- <referrerType>direct</referrerType>
- <referrerTypeName>Direct Entry</referrerTypeName>
- <referrerName />
- <referrerKeyword />
- <referrerKeywordPosition />
- <referrerUrl />
- <referrerSearchEngineUrl />
- <referrerSearchEngineIcon />
- <languageCode />
- <language>Unknown</language>
- <deviceType>Smartphone</deviceType>
- <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/smartphone.png</deviceTypeIcon>
- <deviceBrand>HTC</deviceBrand>
- <deviceModel>Vision</deviceModel>
- <operatingSystem>Android 2.3</operatingSystem>
- <operatingSystemName>Android</operatingSystemName>
- <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon>
- <operatingSystemCode>AND</operatingSystemCode>
- <operatingSystemVersion>2.3</operatingSystemVersion>
- <browserFamily>WebKit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browser>Android Browser</browser>
- <browserName>Android Browser</browserName>
- <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
- <browserCode>AN</browserCode>
- <browserVersion />
- <totalEcommerceRevenue>0</totalEcommerceRevenue>
- <totalEcommerceConversions>0</totalEcommerceConversions>
- <totalEcommerceItems>0</totalEcommerceItems>
- <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
- <totalAbandonedCarts>0</totalAbandonedCarts>
- <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
- <events>0</events>
- <continent>Asia</continent>
- <continentCode>asi</continentCode>
- <country>Japan</country>
- <countryCode>jp</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
- <region />
- <regionCode />
- <city />
- <location>Japan</location>
- <visitLocalTime>16:11:30</visitLocalTime>
- <visitLocalHour>16</visitLocalHour>
- <daysSinceLastVisit>0</daysSinceLastVisit>
- <customVariables>
- <row>
- <customVariableName1>Not-Bot</customVariableName1>
- <customVariableValue1>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</customVariableValue1>
- </row>
- </customVariables>
- <resolution>unknown</resolution>
- <plugins />
- <pluginsIcons />
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
old mode 100644
new mode 100755
index 23449c8af5d844f7e441ecb68dbe1cfb302249aa..93a593f72a407104f0b1025a344f2f58a8b3783b
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_uniq_visitors>11</nb_uniq_visitors>
<nb_users>0</nb_users>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>9</bounce_count>
+ <nb_visits>11</nb_visits>
+ <nb_actions>11</nb_actions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <bounce_count>11</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
old mode 100644
new mode 100755
index 811259d2ddd5c7d8c0ad3f044085c31727620dba..157967c9a3d4669d133f296239b6d9f043f685b9
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>40</nb_actions>
- <nb_visits_converted>26</nb_visits_converted>
- <bounce_count>25</bounce_count>
+ <nb_visits>33</nb_visits>
+ <nb_actions>45</nb_actions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <bounce_count>30</bounce_count>
<sum_visit_length>359</sum_visit_length>
<max_actions>10</max_actions>
- <bounce_rate>89%</bounce_rate>
+ <bounce_rate>91%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>13</avg_time_on_site>
+ <avg_time_on_site>11</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
old mode 100644
new mode 100755
index 209613d7560b9d2e1327718a728d16079f62f9a1..37a8f92b6c6374141aec085e3bc955bf33692f4e
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_uniq_visitors>11</nb_uniq_visitors>
<nb_users>0</nb_users>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>9</bounce_count>
+ <nb_visits>11</nb_visits>
+ <nb_actions>11</nb_actions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <bounce_count>11</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
old mode 100644
new mode 100755
index d7fbf8c040ad4ac280852a13fdf47b5283f94b93..f52b091919967c75f4b19df2ba1a7164ce9fa8cc
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>27</nb_uniq_visitors>
+ <nb_uniq_visitors>32</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
- <nb_visits_converted>25</nb_visits_converted>
- <bounce_count>25</bounce_count>
+ <nb_visits>32</nb_visits>
+ <nb_actions>35</nb_actions>
+ <nb_visits_converted>30</nb_visits_converted>
+ <bounce_count>30</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>93%</bounce_rate>
+ <bounce_rate>94%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>11</avg_time_on_site>
+ <avg_time_on_site>10</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
old mode 100644
new mode 100755
index f1ce3d1ac179204096912d7d33946ca14822105d..425d6d909d2bc621d7508ae5763cdd3cf0e59053
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>26</nb_uniq_visitors>
+ <nb_uniq_visitors>30</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_visits_converted>24</nb_visits_converted>
- <bounce_count>24</bounce_count>
+ <nb_visits>30</nb_visits>
+ <nb_actions>33</nb_actions>
+ <nb_visits_converted>28</nb_visits_converted>
+ <bounce_count>28</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>92%</bounce_rate>
+ <bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>12</avg_time_on_site>
+ <avg_time_on_site>10</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
old mode 100644
new mode 100755
index bebdd468f55bcb95338a072e9a7fe0a3a640f25e..d35a916d0e192d47959451190470afeb58e35bfb
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_visits>28</nb_visits>
- <nb_actions>40</nb_actions>
- <nb_visits_converted>26</nb_visits_converted>
- <bounce_count>25</bounce_count>
+ <nb_visits>33</nb_visits>
+ <nb_actions>45</nb_actions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <bounce_count>30</bounce_count>
<sum_visit_length>359</sum_visit_length>
<max_actions>10</max_actions>
- <bounce_rate>89%</bounce_rate>
+ <bounce_rate>91%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>13</avg_time_on_site>
+ <avg_time_on_site>11</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
index 209613d7560b9d2e1327718a728d16079f62f9a1..37a8f92b6c6374141aec085e3bc955bf33692f4e 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_uniq_visitors>11</nb_uniq_visitors>
<nb_users>0</nb_users>
- <nb_visits>9</nb_visits>
- <nb_actions>9</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>9</bounce_count>
+ <nb_visits>11</nb_visits>
+ <nb_actions>11</nb_actions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <bounce_count>11</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
old mode 100644
new mode 100755
index d7fbf8c040ad4ac280852a13fdf47b5283f94b93..f52b091919967c75f4b19df2ba1a7164ce9fa8cc
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>27</nb_uniq_visitors>
+ <nb_uniq_visitors>32</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>27</nb_visits>
- <nb_actions>30</nb_actions>
- <nb_visits_converted>25</nb_visits_converted>
- <bounce_count>25</bounce_count>
+ <nb_visits>32</nb_visits>
+ <nb_actions>35</nb_actions>
+ <nb_visits_converted>30</nb_visits_converted>
+ <bounce_count>30</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>93%</bounce_rate>
+ <bounce_rate>94%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>11</avg_time_on_site>
+ <avg_time_on_site>10</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
old mode 100644
new mode 100755
index f1ce3d1ac179204096912d7d33946ca14822105d..425d6d909d2bc621d7508ae5763cdd3cf0e59053
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_uniq_visitors>26</nb_uniq_visitors>
+ <nb_uniq_visitors>30</nb_uniq_visitors>
<nb_users>1</nb_users>
- <nb_visits>26</nb_visits>
- <nb_actions>29</nb_actions>
- <nb_visits_converted>24</nb_visits_converted>
- <bounce_count>24</bounce_count>
+ <nb_visits>30</nb_visits>
+ <nb_actions>33</nb_actions>
+ <nb_visits_converted>28</nb_visits_converted>
+ <bounce_count>28</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>92%</bounce_rate>
+ <bounce_rate>93%</bounce_rate>
<nb_actions_per_visit>1.1</nb_actions_per_visit>
- <avg_time_on_site>12</avg_time_on_site>
+ <avg_time_on_site>10</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
old mode 100644
new mode 100755
index bebdd468f55bcb95338a072e9a7fe0a3a640f25e..d35a916d0e192d47959451190470afeb58e35bfb
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result idSite="1">
- <nb_visits>28</nb_visits>
- <nb_actions>40</nb_actions>
- <nb_visits_converted>26</nb_visits_converted>
- <bounce_count>25</bounce_count>
+ <nb_visits>33</nb_visits>
+ <nb_actions>45</nb_actions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <bounce_count>30</bounce_count>
<sum_visit_length>359</sum_visit_length>
<max_actions>10</max_actions>
- <bounce_rate>89%</bounce_rate>
+ <bounce_rate>91%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
- <avg_time_on_site>13</avg_time_on_site>
+ <avg_time_on_site>11</avg_time_on_site>
</result>
<result idSite="2" />
<result idSite="3" />
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 0aaf67dc83917242ec956cfdb02758e0b806d4e4..0e6ef3ff604f02c0df9f6a677391f7ed529ac1f1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>blog</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
+ <nb_visits>11</nb_visits>
+ <nb_hits>11</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
- <sum_bandwidth>21444</sum_bandwidth>
- <nb_hits_with_bandwidth>6</nb_hits_with_bandwidth>
- <min_bandwidth>14296</min_bandwidth>
- <max_bandwidth>14296</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
+ <sum_bandwidth>39314</sum_bandwidth>
+ <nb_hits_with_bandwidth>11</nb_hits_with_bandwidth>
+ <min_bandwidth>21444</min_bandwidth>
+ <max_bandwidth>21444</max_bandwidth>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>11</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>6</entry_bounce_count>
- <exit_nb_visits>6</exit_nb_visits>
+ <entry_bounce_count>11</entry_bounce_count>
+ <exit_nb_visits>11</exit_nb_visits>
<avg_bandwidth>3574</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
@@ -25,61 +25,61 @@
<subtable>
<row>
<label>category</label>
- <nb_visits>5</nb_visits>
- <nb_hits>5</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
- <min_bandwidth>10722</min_bandwidth>
- <max_bandwidth>10722</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
+ <min_bandwidth>17870</min_bandwidth>
+ <max_bandwidth>17870</max_bandwidth>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>meta</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>/index</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index 93ecf7ff87ec0eea669f11ee5194c941cd6e4cfc..3b4881e8c5d83d1ce67c9443efaa66557ff87cf7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -2,96 +2,96 @@
<result>
<row>
<label>blog</label>
- <nb_visits>10</nb_visits>
- <nb_hits>13</nb_hits>
+ <nb_visits>15</nb_visits>
+ <nb_hits>18</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>21530</sum_bandwidth>
- <nb_hits_with_bandwidth>8</nb_hits_with_bandwidth>
+ <sum_bandwidth>39400</sum_bandwidth>
+ <nb_hits_with_bandwidth>13</nb_hits_with_bandwidth>
<min_bandwidth>86</min_bandwidth>
<max_bandwidth>86</max_bandwidth>
- <entry_nb_visits>9</entry_nb_visits>
- <entry_nb_actions>18</entry_nb_actions>
+ <entry_nb_visits>14</entry_nb_visits>
+ <entry_nb_actions>23</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>8</entry_bounce_count>
- <exit_nb_visits>8</exit_nb_visits>
- <avg_bandwidth>2691</avg_bandwidth>
- <avg_time_on_page>13</avg_time_on_page>
- <bounce_rate>89%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>13</entry_bounce_count>
+ <exit_nb_visits>13</exit_nb_visits>
+ <avg_bandwidth>3030</avg_bandwidth>
+ <avg_time_on_page>9</avg_time_on_page>
+ <bounce_rate>93%</bounce_rate>
+ <exit_rate>87%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
<subtable>
<row>
<label>category</label>
- <nb_visits>7</nb_visits>
- <nb_hits>10</nb_hits>
+ <nb_visits>12</nb_visits>
+ <nb_hits>15</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>15</entry_nb_actions>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>20</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
- <bounce_rate>83%</bounce_rate>
- <exit_rate>71%</exit_rate>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
+ <avg_time_on_page>11</avg_time_on_page>
+ <bounce_rate>91%</bounce_rate>
+ <exit_rate>83%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
<subtable>
<row>
<label>meta</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
<subtable>
<row>
<label>/index</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>10</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://included1.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 106455bed503f4390b0ebb7cd2cdc78b3a2325dc..dd0b6c4f3b74a44223cb5c3d10225287d3ecae8c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>blog</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
+ <nb_visits>11</nb_visits>
+ <nb_hits>11</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
- <sum_bandwidth>21444</sum_bandwidth>
- <nb_hits_with_bandwidth>6</nb_hits_with_bandwidth>
- <min_bandwidth>14296</min_bandwidth>
- <max_bandwidth>14296</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
+ <sum_bandwidth>39314</sum_bandwidth>
+ <nb_hits_with_bandwidth>11</nb_hits_with_bandwidth>
+ <min_bandwidth>21444</min_bandwidth>
+ <max_bandwidth>21444</max_bandwidth>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>11</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>6</entry_bounce_count>
- <exit_nb_visits>6</exit_nb_visits>
+ <entry_bounce_count>11</entry_bounce_count>
+ <exit_nb_visits>11</exit_nb_visits>
<avg_bandwidth>3574</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
@@ -25,61 +25,61 @@
<subtable>
<row>
<label>category</label>
- <nb_visits>5</nb_visits>
- <nb_hits>5</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
- <min_bandwidth>10722</min_bandwidth>
- <max_bandwidth>10722</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
+ <min_bandwidth>17870</min_bandwidth>
+ <max_bandwidth>17870</max_bandwidth>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>meta</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>/index</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index 3e2262fa0cd026732182d4c90b8d864c8c714534..be9a597352dcd0db3bcb5b21c5dae42c45d8d6ba 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -2,96 +2,96 @@
<result>
<row>
<label>blog</label>
- <nb_visits>10</nb_visits>
- <nb_hits>13</nb_hits>
+ <nb_visits>15</nb_visits>
+ <nb_hits>18</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>21530</sum_bandwidth>
- <nb_hits_with_bandwidth>8</nb_hits_with_bandwidth>
+ <sum_bandwidth>39400</sum_bandwidth>
+ <nb_hits_with_bandwidth>13</nb_hits_with_bandwidth>
<min_bandwidth>86</min_bandwidth>
<max_bandwidth>86</max_bandwidth>
- <entry_nb_visits>9</entry_nb_visits>
- <entry_nb_actions>18</entry_nb_actions>
+ <entry_nb_visits>14</entry_nb_visits>
+ <entry_nb_actions>23</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>8</entry_bounce_count>
- <exit_nb_visits>8</exit_nb_visits>
- <avg_bandwidth>2691</avg_bandwidth>
- <avg_time_on_page>13</avg_time_on_page>
- <bounce_rate>89%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>13</entry_bounce_count>
+ <exit_nb_visits>13</exit_nb_visits>
+ <avg_bandwidth>3030</avg_bandwidth>
+ <avg_time_on_page>9</avg_time_on_page>
+ <bounce_rate>93%</bounce_rate>
+ <exit_rate>87%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
<subtable>
<row>
<label>category</label>
- <nb_visits>7</nb_visits>
- <nb_hits>10</nb_hits>
+ <nb_visits>12</nb_visits>
+ <nb_hits>15</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>15</entry_nb_actions>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>20</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
- <bounce_rate>83%</bounce_rate>
- <exit_rate>71%</exit_rate>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
+ <avg_time_on_page>11</avg_time_on_page>
+ <bounce_rate>91%</bounce_rate>
+ <exit_rate>83%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
<subtable>
<row>
<label>meta</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
<subtable>
<row>
<label>/index</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>10</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://included1.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 302cda3ea1d46704cb97d541c2ab65b4a7cca8fe..df279bd426eb01c8c173c2e25031f67f5b84acc3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,18 +2,18 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>28</nb_visits>
- <nb_hits>29</nb_hits>
+ <nb_visits>33</nb_visits>
+ <nb_hits>34</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>0.359</max_time_generation>
- <sum_bandwidth>82027</sum_bandwidth>
- <nb_hits_with_bandwidth>25</nb_hits_with_bandwidth>
- <min_bandwidth>16513</min_bandwidth>
- <max_bandwidth>16513</max_bandwidth>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
- <avg_bandwidth>3281</avg_bandwidth>
+ <sum_bandwidth>99897</sum_bandwidth>
+ <nb_hits_with_bandwidth>30</nb_hits_with_bandwidth>
+ <min_bandwidth>20087</min_bandwidth>
+ <max_bandwidth>20087</max_bandwidth>
+ <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
+ <avg_bandwidth>3329</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index ed5a9a08f66ecf472ed6109fb7e8bade3495fc87..81c00d53de31812bcaebfacb7f84dd5f7808e004 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,18 +2,18 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>29</nb_visits>
- <nb_hits>39</nb_hits>
+ <nb_visits>34</nb_visits>
+ <nb_hits>44</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>17</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>82027</sum_bandwidth>
- <nb_hits_with_bandwidth>25</nb_hits_with_bandwidth>
+ <sum_bandwidth>99897</sum_bandwidth>
+ <nb_hits_with_bandwidth>30</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
- <avg_bandwidth>3281</avg_bandwidth>
+ <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <avg_bandwidth>3329</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 44c6dab366b893278fcf631335fb24f7a7b2cc2d..5f975f908c36ea69695e98d3b77e2d04469a21fb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>blog</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
+ <nb_visits>11</nb_visits>
+ <nb_hits>11</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
<min_time_generation />
<max_time_generation>0</max_time_generation>
- <sum_bandwidth>21444</sum_bandwidth>
- <nb_hits_with_bandwidth>6</nb_hits_with_bandwidth>
- <min_bandwidth>14296</min_bandwidth>
- <max_bandwidth>14296</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
+ <sum_bandwidth>39314</sum_bandwidth>
+ <nb_hits_with_bandwidth>11</nb_hits_with_bandwidth>
+ <min_bandwidth>21444</min_bandwidth>
+ <max_bandwidth>21444</max_bandwidth>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>11</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>6</entry_bounce_count>
- <exit_nb_visits>6</exit_nb_visits>
+ <entry_bounce_count>11</entry_bounce_count>
+ <exit_nb_visits>11</exit_nb_visits>
<avg_bandwidth>3574</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
@@ -25,61 +25,61 @@
<subtable>
<row>
<label>category</label>
- <nb_visits>5</nb_visits>
- <nb_hits>5</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
- <min_bandwidth>10722</min_bandwidth>
- <max_bandwidth>10722</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>5</entry_nb_actions>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
+ <min_bandwidth>17870</min_bandwidth>
+ <max_bandwidth>17870</max_bandwidth>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>meta</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<subtable>
<row>
<label>/index</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>9</nb_visits>
+ <nb_hits>9</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
- <min_bandwidth>7148</min_bandwidth>
- <max_bandwidth>7148</max_bandwidth>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
+ <min_bandwidth>14296</min_bandwidth>
+ <max_bandwidth>14296</max_bandwidth>
+ <entry_nb_visits>9</entry_nb_visits>
+ <entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>9</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index e6f1c78d8809fa7078a0e191eeb21923c2ba7a98..77f57d0c4c52d4920ace287b8ea29f03b1326788 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -2,96 +2,96 @@
<result>
<row>
<label>blog</label>
- <nb_visits>10</nb_visits>
- <nb_hits>13</nb_hits>
+ <nb_visits>15</nb_visits>
+ <nb_hits>18</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>21530</sum_bandwidth>
- <nb_hits_with_bandwidth>8</nb_hits_with_bandwidth>
+ <sum_bandwidth>39400</sum_bandwidth>
+ <nb_hits_with_bandwidth>13</nb_hits_with_bandwidth>
<min_bandwidth>86</min_bandwidth>
<max_bandwidth>86</max_bandwidth>
- <entry_nb_visits>9</entry_nb_visits>
- <entry_nb_actions>18</entry_nb_actions>
+ <entry_nb_visits>14</entry_nb_visits>
+ <entry_nb_actions>23</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>8</entry_bounce_count>
- <exit_nb_visits>8</exit_nb_visits>
- <avg_bandwidth>2691</avg_bandwidth>
- <avg_time_on_page>13</avg_time_on_page>
- <bounce_rate>89%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>13</entry_bounce_count>
+ <exit_nb_visits>13</exit_nb_visits>
+ <avg_bandwidth>3030</avg_bandwidth>
+ <avg_time_on_page>9</avg_time_on_page>
+ <bounce_rate>93%</bounce_rate>
+ <exit_rate>87%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
<subtable>
<row>
<label>category</label>
- <nb_visits>7</nb_visits>
- <nb_hits>10</nb_hits>
+ <nb_visits>12</nb_visits>
+ <nb_hits>15</nb_hits>
<sum_time_spent>166</sum_time_spent>
<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_bandwidth>17870</sum_bandwidth>
- <nb_hits_with_bandwidth>5</nb_hits_with_bandwidth>
+ <sum_bandwidth>35740</sum_bandwidth>
+ <nb_hits_with_bandwidth>10</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>6</entry_nb_visits>
- <entry_nb_actions>15</entry_nb_actions>
+ <entry_nb_visits>11</entry_nb_visits>
+ <entry_nb_actions>20</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>5</entry_bounce_count>
- <exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
- <bounce_rate>83%</bounce_rate>
- <exit_rate>71%</exit_rate>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
+ <avg_time_on_page>11</avg_time_on_page>
+ <bounce_rate>91%</bounce_rate>
+ <exit_rate>83%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
<subtable>
<row>
<label>meta</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
<subtable>
<row>
<label>/index</label>
- <nb_visits>5</nb_visits>
- <nb_hits>7</nb_hits>
+ <nb_visits>10</nb_visits>
+ <nb_hits>12</nb_hits>
<sum_time_spent>151</sum_time_spent>
<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
<min_time_generation>0.023</min_time_generation>
<max_time_generation>0.123</max_time_generation>
- <sum_bandwidth>14296</sum_bandwidth>
- <nb_hits_with_bandwidth>4</nb_hits_with_bandwidth>
+ <sum_bandwidth>32166</sum_bandwidth>
+ <nb_hits_with_bandwidth>9</nb_hits_with_bandwidth>
<min_bandwidth>0</min_bandwidth>
<max_bandwidth>0</max_bandwidth>
- <entry_nb_visits>5</entry_nb_visits>
- <entry_nb_actions>14</entry_nb_actions>
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>19</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
- <entry_bounce_count>4</entry_bounce_count>
- <exit_nb_visits>4</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>22</avg_time_on_page>
- <bounce_rate>80%</bounce_rate>
- <exit_rate>80%</exit_rate>
+ <entry_bounce_count>9</entry_bounce_count>
+ <exit_nb_visits>9</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>10</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>9</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>13</avg_time_on_page>
+ <bounce_rate>90%</bounce_rate>
+ <exit_rate>90%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
- <url>http://piwik.net/blog/category/meta/</url>
+ <url>http://included1.com/blog/category/meta/</url>
</row>
</subtable>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index 23f5051f83c4b02767e3f28dee44276a39660ee9..474c99ecabd32954a3a41f7fabdcbc6ce5bef930 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>40</nb_pageviews>
- <nb_uniq_pageviews>39</nb_uniq_pageviews>
+ <nb_pageviews>45</nb_pageviews>
+ <nb_uniq_pageviews>44</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index bf02fbd84ba2cb37096955700d21f7498290cde9..a450cb30d1ed5203c745dc90018906e8b668aacb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>64</nb_pageviews>
- <nb_uniq_pageviews>57</nb_uniq_pageviews>
+ <nb_pageviews>69</nb_pageviews>
+ <nb_uniq_pageviews>62</nb_uniq_pageviews>
<nb_downloads>5</nb_downloads>
<nb_uniq_downloads>5</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Bandwidth.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Bandwidth.get_month.xml
index 8401897a331893582c83cf66eafd7afd21f91af8..00813255271073d2f9343772ec112343dff67003 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Bandwidth.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Bandwidth.get_month.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_total_overall_bandwidth>4437437</nb_total_overall_bandwidth>
- <nb_total_pageview_bandwidth>96764</nb_total_pageview_bandwidth>
+ <nb_total_overall_bandwidth>4455307</nb_total_overall_bandwidth>
+ <nb_total_pageview_bandwidth>114634</nb_total_pageview_bandwidth>
<nb_total_download_bandwidth>4334745</nb_total_download_bandwidth>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 5996574d1f9ba5a5d921eea7fbeb22f313a6b0f0..44c991cf687ec3326423061f2dc504af06ac1415 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>HTTP-code</label>
- <nb_actions>45</nb_actions>
+ <nb_actions>50</nb_actions>
<slots>
<row>
<scope>page</scope>
@@ -17,9 +17,9 @@
<subtable>
<row>
<label>200</label>
- <nb_visits>34</nb_visits>
- <nb_actions>36</nb_actions>
- <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+ <nb_visits>39</nb_visits>
+ <nb_actions>41</nb_actions>
+ <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
index 190fff01c27727430ca2c2b7b74ed97f7ab38f7c..8f81585e8d499429ff4166773daa11b9c4751108 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
@@ -72,7 +72,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>71</nb_actions>
+ <nb_actions>76</nb_actions>
</row>
<row>
<name>Generation Time</name>
@@ -99,7 +99,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>71</nb_actions>
+ <nb_actions>76</nb_actions>
</row>
</usages>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
index 94a694cef6186f6e1d4625c0d4aacf100521ff06..41b8bcdaf0fe64b62ef02f3f7f273d726fbaf9f9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml
@@ -3,19 +3,19 @@
<row>
<label>Cookie</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>6%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/Morpheus/icons/dist/plugins/cookie.png</logo>
</row>
<row>
<label>Flash</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>6%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/Morpheus/icons/dist/plugins/flash.png</logo>
</row>
<row>
<label>Java</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>6%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/Morpheus/icons/dist/plugins/java.png</logo>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 51bf3cd8fbdeee1df9af0bc57b6d3b0aef71d29b..0c4209d1f68b4fd0865d7a55733879582853680c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>35</nb_visits>
- <nb_actions>40</nb_actions>
+ <nb_visits>40</nb_visits>
+ <nb_actions>45</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>31</bounce_count>
+ <bounce_count>36</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>31</nb_conversions>
- <nb_visits_converted>31</nb_visits_converted>
- <revenue>155</revenue>
+ <nb_conversions>36</nb_conversions>
+ <nb_visits_converted>36</nb_visits_converted>
+ <revenue>180</revenue>
</row>
</goals>
- <nb_conversions>31</nb_conversions>
- <revenue>155</revenue>
- <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <nb_conversions>36</nb_conversions>
+ <revenue>180</revenue>
+ <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<logo>plugins/Morpheus/icons/dist/brand/unk.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index 26b425d53095aad58dd5f7c4210ed1ac53759899..f2f0322122dd83b2d67965b298baaf3e80c84f30 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>WebKit (Safari, Chrome)</label>
- <nb_visits>18</nb_visits>
- <nb_actions>21</nb_actions>
+ <nb_visits>23</nb_visits>
+ <nb_actions>26</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>16</bounce_count>
- <nb_visits_converted>17</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
+ <bounce_count>21</bounce_count>
+ <nb_visits_converted>22</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<segment>browserEngine==WebKit</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index c5f696ff21c71261935157b8ed44007d4c2011d6..8bfbbdd2e07d4b8c4ae0c80c1e19156a9d396151 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>RockMelt</label>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
+ </row>
<row>
<label>Chrome</label>
<nb_visits>10</nb_visits>
@@ -24,18 +36,6 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
</row>
- <row>
- <label>RockMelt</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
- </row>
<row>
<label>GNOME Web</label>
<nb_visits>5</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 56a9dcaaea97e4a3832f427ce34c84a0bfadf8e4..db9282fc2c3f64189da110786d85a4edb256da8f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>RockMelt 0.9</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>browserCode==RM;browserVersion==0.9</segment>
<logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 47a767d7abb28f4226067cc4e2d610713792a836..92e83d1cd4273ffbac7cf546f21ddf446226acab 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -1,5 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>RockMelt</label>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
+ <segment>browserCode==RM</segment>
+ </row>
<row>
<label>Chrome</label>
<nb_visits>10</nb_visits>
@@ -26,19 +39,6 @@
<logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo>
<segment>browserCode==IE</segment>
</row>
- <row>
- <label>RockMelt</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo>
- <segment>browserCode==RM</segment>
- </row>
<row>
<label>GNOME Web</label>
<nb_visits>5</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index 5b366a921e6d0cfed6e93a672cde563dcd5fa19d..085d51d878d716e073e55069187b2eec83a74346 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>35</nb_visits>
- <nb_actions>40</nb_actions>
+ <nb_visits>40</nb_visits>
+ <nb_actions>45</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>31</bounce_count>
+ <bounce_count>36</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>31</nb_conversions>
- <nb_visits_converted>31</nb_visits_converted>
- <revenue>155</revenue>
+ <nb_conversions>36</nb_conversions>
+ <nb_visits_converted>36</nb_visits_converted>
+ <revenue>180</revenue>
</row>
</goals>
- <nb_conversions>31</nb_conversions>
- <revenue>155</revenue>
- <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <nb_conversions>36</nb_conversions>
+ <revenue>180</revenue>
+ <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 10b83b8800f82c28a533a3ec685868d235f39824..ebfe76d92ee8f13226520036ff95124159e50bc1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Mac</label>
- <nb_visits>12</nb_visits>
- <nb_actions>16</nb_actions>
+ <nb_visits>17</nb_visits>
+ <nb_actions>21</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>307</sum_visit_length>
- <bounce_count>9</bounce_count>
- <nb_visits_converted>11</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <bounce_count>14</bounce_count>
+ <nb_visits_converted>16</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/Morpheus/icons/dist/os/MAC.png</logo>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index d0f8f30c53e0610c17b5761f79d3df98fcd6135f..05c44600ef73c678bed2ec02a6fc99bebad20a40 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -1,5 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>Mac 10.6</label>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment>
+ <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo>
+ </row>
<row>
<label>GNU/Linux</label>
<nb_visits>8</nb_visits>
@@ -26,19 +39,6 @@
<segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment>
<logo>plugins/Morpheus/icons/dist/os/WIN.png</logo>
</row>
- <row>
- <label>Mac 10.6</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment>
- <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo>
- </row>
<row>
<label>Mac 10.10</label>
<nb_visits>4</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 927bb5670a7d34eb1447d0eeac207ae0cc20fc3b..b509551cf8f70d4132d3529e34d92bc6353a5ca5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>31</nb_visits>
- <nb_actions>36</nb_actions>
+ <nb_visits>36</nb_visits>
+ <nb_actions>41</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>27</bounce_count>
+ <bounce_count>32</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>30</nb_conversions>
- <nb_visits_converted>30</nb_visits_converted>
- <revenue>150</revenue>
+ <nb_conversions>35</nb_conversions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <revenue>175</revenue>
</row>
</goals>
- <nb_conversions>30</nb_conversions>
- <revenue>150</revenue>
- <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
+ <nb_conversions>35</nb_conversions>
+ <revenue>175</revenue>
+ <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>deviceType==desktop</segment>
<logo>plugins/Morpheus/icons/dist/devices/desktop.png</logo>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index b4efda313802d1819ab5e3324cdfc3c0655ec891..06417e5f2aad322db0a6809f172f5861061bf163 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>34</nb_conversions>
+ <nb_conversions>39</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
index 603f6746151a1dc0035c7ffde9ca839533146e4b..1df782d8d8507b250e4aac6397027320a99eabaf 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>35</nb_conversions>
- <nb_visits_converted>35</nb_visits_converted>
- <revenue>175</revenue>
- <conversion_rate>89.74%</conversion_rate>
+ <nb_conversions>40</nb_conversions>
+ <nb_visits_converted>40</nb_visits_converted>
+ <revenue>200</revenue>
+ <conversion_rate>90.91%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index c25b8275f08aebb7f7fa970ac4438504b41011a0..cca7f6ab94e79cc960e1c4deaf55355d7da17d1b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>35</nb_conversions>
+ <nb_conversions>40</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 9c8f8990b0536bf6b8824fff21aff82b8322c62e..d7f6fab345f98221781e4bd1d154609604c221f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>35</nb_conversions>
- <nb_visits_converted>35</nb_visits_converted>
- <revenue>175</revenue>
- <conversion_rate>89.74%</conversion_rate>
- <nb_conversions_new_visit>32</nb_conversions_new_visit>
- <nb_visits_converted_new_visit>32</nb_visits_converted_new_visit>
- <revenue_new_visit>160</revenue_new_visit>
- <conversion_rate_new_visit>88.89%</conversion_rate_new_visit>
+ <nb_conversions>40</nb_conversions>
+ <nb_visits_converted>40</nb_visits_converted>
+ <revenue>200</revenue>
+ <conversion_rate>90.91%</conversion_rate>
+ <nb_conversions_new_visit>37</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>37</nb_visits_converted_new_visit>
+ <revenue_new_visit>185</revenue_new_visit>
+ <conversion_rate_new_visit>90.24%</conversion_rate_new_visit>
<nb_conversions_returning_visit>3</nb_conversions_returning_visit>
<nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
<revenue_returning_visit>15</revenue_returning_visit>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index a98159d82a8459f84c1765a654b401b8167d7297..64d36c95675e04a7ce55b532fc669477f66f98e1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -2256,6 +2256,125 @@
<plugins />
<pluginsIcons />
</row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>73</idVisit>
+ <visitIp>175.41.191.47</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>99</goalPageId>
+
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://www.notdatefiltered.com/blog/category/meta/</url>
+ <pageTitle />
+ <pageIdAction>76</pageIdAction>
+
+
+ <pageId>99</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Singapore</country>
+ <countryCode>sg</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Singapore</location>
+ <latitude>1.367000</latitude>
+ <longitude>103.800000</longitude>
+ <visitLocalTime>08:10:38</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
<row>
<idSite>1</idSite>
<idVisit>61</idVisit>
@@ -5976,8 +6095,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>9</idVisit>
- <visitIp>0.0.0.0</visitIp>
+ <idVisit>69</idVisit>
+ <visitIp>175.41.193.45</visitIp>
<actionDetails>
<row>
@@ -5985,20 +6104,20 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>9</goalPageId>
+ <goalPageId>95</goalPageId>
- <url>http://piwik.net/docs/manage-users/</url>
+ <url>http://included3.com/blog/category/meta/</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
<type>action</type>
- <url>http://piwik.net/docs/manage-users/</url>
+ <url>http://included3.com/blog/category/meta/</url>
<pageTitle />
- <pageIdAction>9</pageIdAction>
+ <pageIdAction>72</pageIdAction>
- <pageId>9</pageId>
+ <pageId>95</pageId>
<bandwidth>3574</bandwidth>
<interactionPosition>1</interactionPosition>
<icon />
@@ -6054,18 +6173,18 @@
<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
- <operatingSystem>Mac 10.8</operatingSystem>
+ <operatingSystem>Mac 10.6</operatingSystem>
<operatingSystemName>Mac</operatingSystemName>
<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
<operatingSystemCode>MAC</operatingSystemCode>
- <operatingSystemVersion>10.8</operatingSystemVersion>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browser>Chrome 19.0</browser>
- <browserName>Chrome</browserName>
- <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
- <browserCode>CH</browserCode>
- <browserVersion>19.0</browserVersion>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
<totalEcommerceRevenue>0</totalEcommerceRevenue>
<totalEcommerceConversions>0</totalEcommerceConversions>
<totalEcommerceItems>0</totalEcommerceItems>
@@ -6073,19 +6192,19 @@
<totalAbandonedCarts>0</totalAbandonedCarts>
<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
<events>0</events>
- <continent>Unknown</continent>
- <continentCode>unk</continentCode>
- <country>Unknown</country>
- <countryCode>xx</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Japan</country>
+ <countryCode>jp</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
<region />
<regionCode />
<city />
- <location>Unknown</location>
- <latitude />
- <longitude />
- <visitLocalTime>21:00:42</visitLocalTime>
- <visitLocalHour>21</visitLocalHour>
+ <location>Japan</location>
+ <latitude>36</latitude>
+ <longitude>138</longitude>
+ <visitLocalTime>08:10:38</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
<customVariables>
</customVariables>
@@ -6095,8 +6214,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>8</idVisit>
- <visitIp>0.0.0.0</visitIp>
+ <idVisit>71</idVisit>
+ <visitIp>175.41.191.45</visitIp>
<actionDetails>
<row>
@@ -6104,20 +6223,20 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>8</goalPageId>
+ <goalPageId>97</goalPageId>
- <url>http://piwik.net/docs/</url>
+ <url>http://included1.com/blog/category/meta/</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
<type>action</type>
- <url>http://piwik.net/docs/</url>
+ <url>http://included1.com/blog/category/meta/</url>
<pageTitle />
- <pageIdAction>8</pageIdAction>
+ <pageIdAction>74</pageIdAction>
- <pageId>8</pageId>
+ <pageId>97</pageId>
<bandwidth>3574</bandwidth>
<interactionPosition>1</interactionPosition>
<icon />
@@ -6173,18 +6292,18 @@
<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
- <operatingSystem>GNU/Linux</operatingSystem>
- <operatingSystemName>GNU/Linux</operatingSystemName>
- <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
- <operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemVersion />
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browser>Firefox 6.0</browser>
- <browserName>Firefox</browserName>
- <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>6.0</browserVersion>
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
<totalEcommerceRevenue>0</totalEcommerceRevenue>
<totalEcommerceConversions>0</totalEcommerceConversions>
<totalEcommerceItems>0</totalEcommerceItems>
@@ -6192,19 +6311,19 @@
<totalAbandonedCarts>0</totalAbandonedCarts>
<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
<events>0</events>
- <continent>Unknown</continent>
- <continentCode>unk</continentCode>
- <country>Unknown</country>
- <countryCode>xx</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Singapore</country>
+ <countryCode>sg</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
<region />
<regionCode />
<city />
- <location>Unknown</location>
- <latitude />
- <longitude />
- <visitLocalTime>20:56:45</visitLocalTime>
- <visitLocalHour>20</visitLocalHour>
+ <location>Singapore</location>
+ <latitude>1.367000</latitude>
+ <longitude>103.800000</longitude>
+ <visitLocalTime>08:10:38</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
<customVariables>
</customVariables>
@@ -6214,8 +6333,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>7</idVisit>
- <visitIp>72.44.32.10</visitIp>
+ <idVisit>9</idVisit>
+ <visitIp>0.0.0.0</visitIp>
<actionDetails>
<row>
@@ -6223,20 +6342,20 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>7</goalPageId>
+ <goalPageId>9</goalPageId>
- <url>http://piwik.net/translations/</url>
+ <url>http://piwik.net/docs/manage-users/</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
<type>action</type>
- <url>http://piwik.net/translations/</url>
+ <url>http://piwik.net/docs/manage-users/</url>
<pageTitle />
- <pageIdAction>7</pageIdAction>
+ <pageIdAction>9</pageIdAction>
- <pageId>7</pageId>
+ <pageId>9</pageId>
<bandwidth>3574</bandwidth>
<interactionPosition>1</interactionPosition>
<icon />
@@ -6292,11 +6411,11 @@
<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
<deviceBrand>Unknown</deviceBrand>
<deviceModel />
- <operatingSystem>GNU/Linux</operatingSystem>
- <operatingSystemName>GNU/Linux</operatingSystemName>
- <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
- <operatingSystemCode>LIN</operatingSystemCode>
- <operatingSystemVersion />
+ <operatingSystem>Mac 10.8</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.8</operatingSystemVersion>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browser>Chrome 19.0</browser>
@@ -6311,19 +6430,19 @@
<totalAbandonedCarts>0</totalAbandonedCarts>
<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
<events>0</events>
- <continent>North America</continent>
- <continentCode>amn</continentCode>
- <country>United States</country>
- <countryCode>us</countryCode>
- <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
- <region>Virginia</region>
- <regionCode>VA</regionCode>
- <city>Ashburn</city>
- <location>Ashburn, Virginia, United States</location>
- <latitude>39.044000</latitude>
- <longitude>-77.488000</longitude>
- <visitLocalTime>13:49:48</visitLocalTime>
- <visitLocalHour>13</visitLocalHour>
+ <continent>Unknown</continent>
+ <continentCode>unk</continentCode>
+ <country>Unknown</country>
+ <countryCode>xx</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Unknown</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>21:00:42</visitLocalTime>
+ <visitLocalHour>21</visitLocalHour>
<daysSinceLastVisit>0</daysSinceLastVisit>
<customVariables>
</customVariables>
@@ -6333,8 +6452,8 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>6</idVisit>
- <visitIp>72.44.32.10</visitIp>
+ <idVisit>8</idVisit>
+ <visitIp>0.0.0.0</visitIp>
<actionDetails>
<row>
@@ -6342,20 +6461,258 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>6</goalPageId>
+ <goalPageId>8</goalPageId>
- <url>http://piwik.net/download/counter/</url>
+ <url>http://piwik.net/docs/</url>
<icon>plugins/Morpheus/images/goal.png</icon>
</row>
<row>
<type>action</type>
- <url>http://piwik.net/download/counter/</url>
+ <url>http://piwik.net/docs/</url>
<pageTitle />
- <pageIdAction>6</pageIdAction>
+ <pageIdAction>8</pageIdAction>
- <pageId>6</pageId>
+ <pageId>8</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>GNU/Linux</operatingSystem>
+ <operatingSystemName>GNU/Linux</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
+ <operatingSystemCode>LIN</operatingSystemCode>
+ <operatingSystemVersion />
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 6.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>6.0</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Unknown</continent>
+ <continentCode>unk</continentCode>
+ <country>Unknown</country>
+ <countryCode>xx</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Unknown</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>20:56:45</visitLocalTime>
+ <visitLocalHour>20</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>7</idVisit>
+ <visitIp>72.44.32.10</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>7</goalPageId>
+
+ <url>http://piwik.net/translations/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/translations/</url>
+ <pageTitle />
+ <pageIdAction>7</pageIdAction>
+
+
+ <pageId>7</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>GNU/Linux</operatingSystem>
+ <operatingSystemName>GNU/Linux</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
+ <operatingSystemCode>LIN</operatingSystemCode>
+ <operatingSystemVersion />
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Chrome 19.0</browser>
+ <browserName>Chrome</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
+ <browserCode>CH</browserCode>
+ <browserVersion>19.0</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
+ <region>Virginia</region>
+ <regionCode>VA</regionCode>
+ <city>Ashburn</city>
+ <location>Ashburn, Virginia, United States</location>
+ <latitude>39.044000</latitude>
+ <longitude>-77.488000</longitude>
+ <visitLocalTime>13:49:48</visitLocalTime>
+ <visitLocalHour>13</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>6</idVisit>
+ <visitIp>72.44.32.10</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>6</goalPageId>
+
+ <url>http://piwik.net/download/counter/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/download/counter/</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+
+ <pageId>6</pageId>
<bandwidth>3574</bandwidth>
<interactionPosition>1</interactionPosition>
<icon />
@@ -6926,6 +7283,244 @@
<plugins />
<pluginsIcons />
</row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>70</idVisit>
+ <visitIp>175.41.193.46</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>96</goalPageId>
+
+ <url>http://www.included4.com/blog/category/meta/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://www.included4.com/blog/category/meta/</url>
+ <pageTitle />
+ <pageIdAction>73</pageIdAction>
+
+
+ <pageId>96</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Japan</country>
+ <countryCode>jp</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Japan</location>
+ <latitude>36</latitude>
+ <longitude>138</longitude>
+ <visitLocalTime>08:10:39</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>72</idVisit>
+ <visitIp>175.41.191.46</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>98</goalPageId>
+
+ <url>http://www.included2.com/blog/category/meta/</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://www.included2.com/blog/category/meta/</url>
+ <pageTitle />
+ <pageIdAction>75</pageIdAction>
+
+
+ <pageId>98</pageId>
+ <bandwidth>3574</bandwidth>
+ <interactionPosition>1</interactionPosition>
+ <icon />
+
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <bandwidth_pretty>3.5 K</bandwidth_pretty>
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+
+
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <interactions>1</interactions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Mac 10.6</operatingSystem>
+ <operatingSystemName>Mac</operatingSystemName>
+ <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
+ <operatingSystemCode>MAC</operatingSystemCode>
+ <operatingSystemVersion>10.6</operatingSystemVersion>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
+ <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
+ <browserCode>RM</browserCode>
+ <browserVersion>0.9</browserVersion>
+ <totalEcommerceRevenue>0</totalEcommerceRevenue>
+ <totalEcommerceConversions>0</totalEcommerceConversions>
+ <totalEcommerceItems>0</totalEcommerceItems>
+ <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
+ <totalAbandonedCarts>0</totalAbandonedCarts>
+ <totalAbandonedCartsItems>0</totalAbandonedCartsItems>
+ <events>0</events>
+ <continent>Asia</continent>
+ <continentCode>asi</continentCode>
+ <country>Singapore</country>
+ <countryCode>sg</countryCode>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>Singapore</location>
+ <latitude>1.367000</latitude>
+ <longitude>103.800000</longitude>
+ <visitLocalTime>08:10:39</visitLocalTime>
+ <visitLocalHour>8</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+ </row>
<row>
<idSite>1</idSite>
<idVisit>1</idVisit>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index fd2d4e58ad4dcc5f42b3489e64984994703421e8..c219d48a6c962e9f9b6cae2ce404e35bf3bf5f11 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
- <nb_pageviews>40</nb_pageviews>
- <revenue>175</revenue>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
+ <nb_pageviews>45</nb_pageviews>
+ <revenue>200</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 5adcb351b840be3377e2e0d84beb0db3b86471ba..d90ee5a8f694ec6bc19cd5bea3ab084eda9f952a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
- <nb_pageviews>40</nb_pageviews>
- <revenue>175</revenue>
+ <nb_pageviews>45</nb_pageviews>
+ <revenue>200</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 81319449879f284bf949ef73f3855e4089755309..d212bc704670770313794581434a002d42437503 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>35</nb_visits>
- <nb_actions>40</nb_actions>
+ <nb_visits>40</nb_visits>
+ <nb_actions>45</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>31</bounce_count>
+ <bounce_count>36</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>31</nb_conversions>
- <nb_visits_converted>31</nb_visits_converted>
- <revenue>155</revenue>
+ <nb_conversions>36</nb_conversions>
+ <nb_visits_converted>36</nb_visits_converted>
+ <revenue>180</revenue>
</row>
</goals>
- <nb_conversions>31</nb_conversions>
- <revenue>155</revenue>
- <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <nb_conversions>36</nb_conversions>
+ <revenue>180</revenue>
+ <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<segment>referrerType==direct</segment>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
index b31bc62a1c8a67ded6f3b4985f87bd721a174bac..952351cc06b6f388c8a7b4e77c7b0b1485c128c3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Mac / RockMelt / unknown</label>
- <nb_visits>6</nb_visits>
- <nb_actions>9</nb_actions>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
index d8f74a118c3dc7af9f3d2f8fb76ef4d2e8792ce1..053fc1c19cb0867242ac5d0d11e627bed855dce6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>37</nb_visits>
- <nb_actions>44</nb_actions>
+ <nb_visits>42</nb_visits>
+ <nb_actions>49</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>32</bounce_count>
- <nb_visits_converted>33</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+ <bounce_count>37</bounce_count>
+ <nb_visits_converted>38</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<segment>resolution==unknown</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index e7b230a21064be6ee121aeb8a3a2e47837ba8ce0..50a5b4dbecfc66ac17faab2d5853e6831cbc4a51 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>31</nb_visits>
- <nb_actions>38</nb_actions>
+ <nb_visits>36</nb_visits>
+ <nb_actions>43</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>26</bounce_count>
+ <bounce_count>31</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>27</nb_conversions>
- <nb_visits_converted>27</nb_visits_converted>
- <revenue>135</revenue>
+ <nb_conversions>32</nb_conversions>
+ <nb_visits_converted>32</nb_visits_converted>
+ <revenue>160</revenue>
</row>
</goals>
- <nb_conversions>27</nb_conversions>
- <revenue>135</revenue>
- <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
+ <nb_conversions>32</nb_conversions>
+ <revenue>160</revenue>
+ <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<city_name>Unknown</city_name>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 4d15ccdb89c8a4c1386e456380771962a78d0969..581bd0118d2abb057027c6cc761acf87e14b92f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Asia</label>
- <nb_visits>12</nb_visits>
- <nb_actions>15</nb_actions>
+ <nb_visits>17</nb_visits>
+ <nb_actions>20</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>10</bounce_count>
+ <bounce_count>15</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>11</nb_conversions>
- <nb_visits_converted>11</nb_visits_converted>
- <revenue>55</revenue>
+ <nb_conversions>16</nb_conversions>
+ <nb_visits_converted>16</nb_visits_converted>
+ <revenue>80</revenue>
</row>
</goals>
- <nb_conversions>11</nb_conversions>
- <revenue>55</revenue>
- <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+ <nb_conversions>16</nb_conversions>
+ <revenue>80</revenue>
+ <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>Asia</code>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 63c3f98c5af1ad17e69bd303ecef1af08e46e3f7..cbc2d915ef482ed4ec3f7899620dd3296be58fbc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Japan</label>
- <nb_visits>11</nb_visits>
- <nb_actions>14</nb_actions>
+ <nb_visits>13</nb_visits>
+ <nb_actions>16</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>9</bounce_count>
+ <bounce_count>11</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>10</nb_conversions>
- <nb_visits_converted>10</nb_visits_converted>
- <revenue>50</revenue>
+ <nb_conversions>12</nb_conversions>
+ <nb_visits_converted>12</nb_visits_converted>
+ <revenue>60</revenue>
</row>
</goals>
- <nb_conversions>10</nb_conversions>
- <revenue>50</revenue>
- <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
+ <nb_conversions>12</nb_conversions>
+ <revenue>60</revenue>
+ <sum_daily_nb_uniq_visitors>13</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<code>jp</code>
<logo>plugins/Morpheus/icons/dist/flags/jp.png</logo>
@@ -93,6 +93,29 @@
<segment>countryCode==br</segment>
<logoHeight>16</logoHeight>
</row>
+ <row>
+ <label>Singapore</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>3</nb_conversions>
+ <nb_visits_converted>3</nb_visits_converted>
+ <revenue>15</revenue>
+ </row>
+ </goals>
+ <nb_conversions>3</nb_conversions>
+ <revenue>15</revenue>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <code>sg</code>
+ <logo>plugins/Morpheus/icons/dist/flags/sg.png</logo>
+ <segment>countryCode==sg</segment>
+ <logoHeight>16</logoHeight>
+ </row>
<row>
<label>Australia</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
index 773871bab0c36700c4796d59d13528a1717a7e8d..e52ca0ecb15aabd3c0978ada9f4886e6895a47db 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>7</result>
\ No newline at end of file
+<result>8</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 0b3b63e9198de998d0ea97676e5df145fc57cde6..a8b1df01e5aa043807b51e51ccc57d4716afe659 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>31</nb_visits>
- <nb_actions>38</nb_actions>
+ <nb_visits>36</nb_visits>
+ <nb_actions>43</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>26</bounce_count>
+ <bounce_count>31</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>27</nb_conversions>
- <nb_visits_converted>27</nb_visits_converted>
- <revenue>135</revenue>
+ <nb_conversions>32</nb_conversions>
+ <nb_visits_converted>32</nb_visits_converted>
+ <revenue>160</revenue>
</row>
</goals>
- <nb_conversions>27</nb_conversions>
- <revenue>135</revenue>
- <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
+ <nb_conversions>32</nb_conversions>
+ <revenue>160</revenue>
+ <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<region>xx</region>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
index 029f2ea4a7edc46f6e9552727d3c5ec0b34202e8..c7ee31e0be0db3f9a3bc0d08207c6bc82dffdad3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown (xx)</label>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>34</bounce_count>
- <nb_visits_converted>35</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <bounce_count>39</bounce_count>
+ <nb_visits_converted>40</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>42</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
index 5a86d88387c7ada39de93c23bd10765040491523..c8f5f737d3b34b2fbc916977330c886babf61a7c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>34</bounce_count>
- <nb_visits_converted>35</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <bounce_count>39</bounce_count>
+ <nb_visits_converted>40</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>42</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index cc47ebdc6eff3be8d8e216bc780895d1457ded46..f4ed2f3a4b878fcc85901a6637adbf48af33ddfc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -29,24 +29,24 @@
</row>
<row>
<label>Thursday</label>
- <nb_visits>11</nb_visits>
- <nb_uniq_visitors>11</nb_uniq_visitors>
- <nb_actions>12</nb_actions>
+ <nb_visits>13</nb_visits>
+ <nb_uniq_visitors>13</nb_uniq_visitors>
+ <nb_actions>14</nb_actions>
<nb_users>0</nb_users>
<sum_visit_length>242</sum_visit_length>
- <bounce_count>10</bounce_count>
- <nb_visits_converted>11</nb_visits_converted>
+ <bounce_count>12</bounce_count>
+ <nb_visits_converted>13</nb_visits_converted>
<day_of_week>4</day_of_week>
</row>
<row>
<label>Friday</label>
- <nb_visits>6</nb_visits>
- <nb_uniq_visitors>6</nb_uniq_visitors>
- <nb_actions>6</nb_actions>
+ <nb_visits>8</nb_visits>
+ <nb_uniq_visitors>8</nb_uniq_visitors>
+ <nb_actions>8</nb_actions>
<nb_users>0</nb_users>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
+ <bounce_count>8</bounce_count>
+ <nb_visits_converted>8</nb_visits_converted>
<day_of_week>5</day_of_week>
</row>
<row>
@@ -62,13 +62,13 @@
</row>
<row>
<label>Sunday</label>
- <nb_visits>2</nb_visits>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_uniq_visitors>3</nb_uniq_visitors>
+ <nb_actions>3</nb_actions>
<nb_users>0</nb_users>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
<day_of_week>7</day_of_week>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 79a0caae72089a6bf0883f0985bb1789566b1c6b..1352c26a3ef9c8faa673bde97622481b6f146a7e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -98,13 +98,13 @@
</row>
<row>
<label>08</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
- <nb_visits_converted>5</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>10</bounce_count>
+ <nb_visits_converted>10</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>visitLocalHour==8</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index d4bcc2ab0c56339a18485dd74399ae33b8ae9e99..bc70d171b823f7c3c0112107cc96088a02f8bb2e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -125,21 +125,21 @@
</row>
<row>
<label>08</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>9</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>9</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>4</nb_conversions>
- <nb_visits_converted>4</nb_visits_converted>
- <revenue>20</revenue>
+ <nb_conversions>9</nb_conversions>
+ <nb_visits_converted>9</nb_visits_converted>
+ <revenue>45</revenue>
</row>
</goals>
- <nb_conversions>4</nb_conversions>
- <revenue>20</revenue>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <nb_conversions>9</nb_conversions>
+ <revenue>45</revenue>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<segment>visitServerHour==8</segment>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index c39484f83daf7bb60cc4453b6467c9a343f00e41..a65308d1a389363613287b609abbc174873c55d7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>36</nb_visits>
+ <nb_visits>41</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index adb58e2a56dafe112582bbd3b5081e4de796ab54..8a6dc632fc2ef6d2ceba1ec370ce15007965f7d3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>40</nb_visits>
+ <nb_visits>45</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 4eb8fddf6540b09be85e040dab6f135da5df337d..676499c4f68489b7890d329c2dc5f9f3b3b1927f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>39</nb_visits>
+ <nb_visits>44</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index f02d54dcf50bf813109ca20ce304ac9b44ce8776..0f1923317756e59aff5f11e9ec6c7d3316a81d1a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,8 +2,8 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>45</nb_visits>
- <nb_visits_percentage>87%</nb_visits_percentage>
+ <nb_visits>50</nb_visits>
+ <nb_visits_percentage>88%</nb_visits_percentage>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 174a8d90d0685e2b99f3dbebd2293494a931f253..61b2671ef05cc7256ce1a68f19bde83df3edaf6e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>34</nb_visits>
+ <nb_visits>39</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index d771a07bc9b8ecaa69171fd5a36ce98583b4ec30..52f9dc861a4406dbf8510459ef563d2fa69ec0bc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>43</nb_visits>
+ <nb_visits>48</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index 5809c92de9012546ac7ea714a3f89729d80759ca..657a69f505a49873971665165021f30294d43f19 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>36</nb_visits>
+ <nb_visits>41</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index 6f5a23aa2a6814e204530b9d1fc00f55ca3f367b..2ac910e9bc6f4e9e3812f064ce0b0aa7c1efcffb 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>46</nb_visits>
+ <nb_visits>51</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 0e7e4e3d09acd87fee84b679b962e412779dfd0c..2fed36cda38823d90836f38f2d4f0231e68cfa0d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>46</result>
\ No newline at end of file
+<result>51</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 5c61a821373deec98f78930e39ce94f861fa30e2..f24432d1a4c6e343519ab3c4a9e5e8687a0fc805 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>34</result>
\ No newline at end of file
+<result>39</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 51a0bb84729fdb92da5bb75688557a9e186f4c1d..36a787c47a4e180ca01d5fd662a31483ef5e93b6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>37</result>
\ No newline at end of file
+<result>42</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 8e4b837a6265c3a8607e7c11d3e4f394488f9fce..a59088da03444ac92c3c0906d87ff37d2c40ff17 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>35</result>
\ No newline at end of file
+<result>40</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index f24432d1a4c6e343519ab3c4a9e5e8687a0fc805..1e4ba1a5cbfca738f1cf19b41901590161dde6aa 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>39</result>
\ No newline at end of file
+<result>44</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 94dde51493a55cd0962172b9e22d848219858501..2547adbd575c161151eb87cc8def4f6cc94bb340 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>37</nb_uniq_visitors>
+ <nb_uniq_visitors>42</nb_uniq_visitors>
<nb_users>3</nb_users>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>34</bounce_count>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
+ <nb_visits_converted>40</nb_visits_converted>
+ <bounce_count>39</bounce_count>
<sum_visit_length>551</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>87%</bounce_rate>
+ <bounce_rate>89%</bounce_rate>
<nb_actions_per_visit>1.2</nb_actions_per_visit>
- <avg_time_on_site>14</avg_time_on_site>
+ <avg_time_on_site>13</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 94b54bf27a6b2ec2e78f92534404fcff433f576e..9014e713e1812aecb7defe719b53351194090a63 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
<result date="2012-08">
<row>
<label>Piwik test</label>
- <nb_visits>39</nb_visits>
- <nb_actions>46</nb_actions>
- <nb_pageviews>40</nb_pageviews>
- <revenue>175</revenue>
- <nb_conversions>35</nb_conversions>
+ <nb_visits>44</nb_visits>
+ <nb_actions>51</nb_actions>
+ <nb_pageviews>45</nb_pageviews>
+ <revenue>200</revenue>
+ <nb_conversions>40</nb_conversions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
@@ -58,11 +58,11 @@
<nb_pageviews>10</nb_pageviews>
<revenue>5</revenue>
<nb_conversions>1</nb_conversions>
- <visits_evolution>-97.4%</visits_evolution>
- <actions_evolution>-78.3%</actions_evolution>
- <pageviews_evolution>-75%</pageviews_evolution>
- <revenue_evolution>-97.1%</revenue_evolution>
- <nb_conversions_evolution>-97.1%</nb_conversions_evolution>
+ <visits_evolution>-97.7%</visits_evolution>
+ <actions_evolution>-80.4%</actions_evolution>
+ <pageviews_evolution>-77.8%</pageviews_evolution>
+ <revenue_evolution>-97.5%</revenue_evolution>
+ <nb_conversions_evolution>-97.5%</nb_conversions_evolution>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
old mode 100755
new mode 100644
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
old mode 100755
new mode 100644
diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log
index 0a162381b78f3d0e1c2e13c6fd07bf50775e2f9e..e604c860bb89d807e5bf7fa088f7d0ba8506f930 100644
--- a/tests/resources/access-logs/fake_logs_replay.log
+++ b/tests/resources/access-logs/fake_logs_replay.log
@@ -28,3 +28,6 @@
193.159.20.129 - - [13/Mar/2014:01:34:42 +0100] "GET /piwik.php?action_name=demo.piwik.org%2FPiwik%20Forums%20-%20Piwik%20%E2%80%BA%20Web%20Analytics%20Reports&idsite=1&rec=1&r=546849&h=1&m=34&s=37&url=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7%23%2Fmodule%3DLive%26action%3DindexVisitorLog%26date%3Dyesterday%26period%3Dday%26idSite%3D7&urlref=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DMultiSites%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D32&_id=d80e3396f1a4c2ac&_idts=1394665308&_idvc=1&_idn=0&_refts=0&_viewts=1394365308&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1200&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%2C%222%22%3A%5B%22Demo%20language%22%2C%22English%22%5D%7D>_ms=413 HTTP/1.1" 200 43 "http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.45 Safari/537.36"
206.190.75.8 - - [13/Mar/2014:01:34:46 +0100] "GET /piwik.php?action_name=Contact%20the%20Piwik%20team%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=456386&h=17&m=34&s=45&url=http%3A%2F%2Fpiwik.org%2Fcontact%2F&urlref=http%3A%2F%2Fpiwik.org%2Fchangelog%2F&_id=e0eb35c4fae2aa0a&_idts=1379033580&_idvc=2&_idn=0&_refts=1394169945&_viewts=1379033693&_ref=http%3A%2F%2Ftrends.builtwith.com%2Fanalytics%2FPiwik-Web-Analytics&res=1536x864&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/contact/" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; .NET4.0C; InfoPath.2)"
174.97.139.63 - - [13/Mar/2014:01:34:53 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=022131&h=20&m=34&s=49&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&_id=d98b53d7fcf5a082&_idts=1394670890&_idvc=77&_idn=1&_refts=1394670890&_viewts=1394670890&_ref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=292 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36"
+
+# excluded logs
+174.97.139.63 - - [13/Mar/2010:01:34:53 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=022131&h=20&m=34&s=49&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&_id=d98b53d7fcf5a082&_idts=1394670890&_idvc=77&_idn=1&_refts=1394670890&_viewts=1394670890&_ref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=292 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36"
diff --git a/tests/resources/access-logs/fake_logs_replay_host.log b/tests/resources/access-logs/fake_logs_replay_host.log
new file mode 100644
index 0000000000000000000000000000000000000000..31dfce6c6faf3ffdfc42de047811788a4c4d5055
--- /dev/null
+++ b/tests/resources/access-logs/fake_logs_replay_host.log
@@ -0,0 +1,3 @@
+# excluded logs
+piwik.org 174.97.139.63 - - [13/Mar/2010:01:34:53 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=022131&h=20&m=34&s=49&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&_id=d98b53d7fcf5a082&_idts=1394670890&_idvc=77&_idn=1&_refts=1394670890&_viewts=1394670890&_ref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=292 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36"
+excluded.com 174.97.139.63 - - [13/Mar/2016:01:34:53 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=022131&h=20&m=34&s=49&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&_id=d98b53d7fcf5a082&_idts=1394670890&_idvc=77&_idn=1&_refts=1394670890&_viewts=1394670890&_ref=http%3A%2F%2Fblog.comperiosearch.com%2Fblog%2F2014%2F02%2F05%2Fdynamic-search-ranking-using-elasticsearch-neo4j-and-piwik%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=292 HTTP/1.1" 200 43 "http://piwik.org" "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36"
diff --git a/tests/resources/access-logs/filter_exclude_logs.log b/tests/resources/access-logs/filter_exclude_logs.log
new file mode 100644
index 0000000000000000000000000000000000000000..3040abed06d1ee9835cafcc16452ce2b3cb5080a
--- /dev/null
+++ b/tests/resources/access-logs/filter_exclude_logs.log
@@ -0,0 +1,10 @@
+# excluded logs
+175.41.191.41 - - [09/Aug/2012:10:10:38 +0200] "GET http://filtered1.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.191.42 - - [09/Aug/2012:10:10:38 +0200] "GET http://www.filtered2.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.191.43 - - [09/Jul/2012:10:10:38 +0200] "GET http://www.datefiltered.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.191.44 - - [09/Sep/2012:10:10:38 +0200] "GET http://www.datefiltered.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+
+# included logs
+175.41.191.45 - - [10/Aug/2012:10:10:38 +0200] "GET http://included1.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.191.46 - - [09/Aug/2012:10:10:39 +0200] "GET http://www.included2.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.191.47 - - [19/Aug/2012:10:10:38 +0200] "GET http://www.notdatefiltered.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
diff --git a/tests/resources/access-logs/filter_include_logs.log b/tests/resources/access-logs/filter_include_logs.log
new file mode 100644
index 0000000000000000000000000000000000000000..99ac478a54ff1c9c9f046f0b655df0de76c10949
--- /dev/null
+++ b/tests/resources/access-logs/filter_include_logs.log
@@ -0,0 +1,7 @@
+# excluded logs
+175.41.193.41 - - [09/Aug/2012:10:10:38 +0200] "GET http://filtered1.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.193.42 - - [09/Aug/2012:10:10:38 +0200] "GET http://www.filtered2.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+
+# included logs
+175.41.193.45 - - [10/Aug/2012:10:10:38 +0200] "GET http://included3.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"
+175.41.193.46 - - [09/Aug/2012:10:10:39 +0200] "GET http://www.included4.com/blog/category/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24"