From bf2fdd4aa997fbae4ad7ade43d383f7947afe77c Mon Sep 17 00:00:00 2001
From: diosmosis <benaka.moorthi@gmail.com>
Date: Thu, 18 Apr 2013 06:23:00 +0000
Subject: [PATCH] Fixes #3832, add --force-lowercase-path option to log
importer script that makes all paths lowercase before importing hits.
---
misc/log-analytics/import_logs.py | 8 ++
.../Fixtures/ManySitesImportedLogs.php | 3 +-
...rtLogs__Actions.getEntryPageUrls_month.xml | 54 +++++------
...ortLogs__Actions.getExitPageUrls_month.xml | 54 +++++------
...mportLogs__Actions.getPageTitles_month.xml | 6 +-
..._ImportLogs__Actions.getPageUrls_month.xml | 54 +++++------
.../test_ImportLogs__Actions.get_month.xml | 4 +-
...stomVariables.getCustomVariables_month.xml | 96 +++++++++----------
...tLogs__Goals.getDaysToConversion_month.xml | 2 +-
...__Goals.getVisitsUntilConversion_month.xml | 2 +-
.../test_ImportLogs__Goals.get_month.xml | 8 +-
...st_ImportLogs__MultiSites.getAll_month.xml | 8 +-
...st_ImportLogs__MultiSites.getOne_month.xml | 8 +-
...ImportLogs__Provider.getProvider_month.xml | 10 +-
...ortLogs__Referers.getRefererType_month.xml | 18 ++--
..._ImportLogs__UserCountry.getCity_month.xml | 18 ++--
...rtLogs__UserCountry.getContinent_month.xml | 18 ++--
...portLogs__UserCountry.getCountry_month.xml | 18 ++--
...mportLogs__UserCountry.getRegion_month.xml | 18 ++--
...ogs__UserSettings.getBrowserType_month.xml | 10 +-
...__UserSettings.getBrowserVersion_month.xml | 10 +-
...ortLogs__UserSettings.getBrowser_month.xml | 10 +-
...s__UserSettings.getConfiguration_month.xml | 20 ++--
...rtLogs__UserSettings.getLanguage_month.xml | 10 +-
..._UserSettings.getMobileVsDesktop_month.xml | 10 +-
...rtLogs__UserSettings.getOSFamily_month.xml | 10 +-
...t_ImportLogs__UserSettings.getOS_month.xml | 10 +-
...portLogs__UserSettings.getPlugin_month.xml | 14 +--
...Logs__UserSettings.getResolution_month.xml | 10 +-
...Logs__UserSettings.getWideScreen_month.xml | 10 +-
...rtLogs__VisitTime.getByDayOfWeek_month.xml | 10 +-
....getVisitInformationPerLocalTime_month.xml | 10 +-
...getVisitInformationPerServerTime_month.xml | 18 ++--
...getNumberOfVisitsByDaysSinceLast_month.xml | 2 +-
...st.getNumberOfVisitsByVisitCount_month.xml | 2 +-
...nterest.getNumberOfVisitsPerPage_month.xml | 2 +-
...etNumberOfVisitsPerVisitDuration_month.xml | 2 +-
...rtLogs__VisitsSummary.getActions_month.xml | 2 +-
...gs__VisitsSummary.getBounceCount_month.xml | 2 +-
..._VisitsSummary.getUniqueVisitors_month.xml | 2 +-
...VisitsSummary.getVisitsConverted_month.xml | 2 +-
...ortLogs__VisitsSummary.getVisits_month.xml | 2 +-
...st_ImportLogs__VisitsSummary.get_month.xml | 10 +-
tests/resources/fake_logs_enable_all.log | 2 +-
44 files changed, 304 insertions(+), 295 deletions(-)
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 3be72a186c..b7012449e0 100755
--- a/misc/log-analytics/import_logs.py
+++ b/misc/log-analytics/import_logs.py
@@ -399,6 +399,11 @@ class Configuration(object):
help="Invalidate reports for the specified dates (format: YYYY-MM-DD,YYYY-MM-DD,...). "
"By default, all dates found in the logs will be invalidated.",
)
+ option_parser.add_option(
+ '--force-lowercase-path', dest='force_lowercase_path', default=False, action='store_true',
+ help="Make URL path lowercase so paths with the same letters but different cases are "
+ "treated the same."
+ )
return option_parser
@@ -1225,6 +1230,9 @@ class Hit(object):
for key, value in kwargs.iteritems():
setattr(self, key, value)
super(Hit, self).__init__()
+
+ if config.options.force_lowercase_path:
+ self.full_path = self.full_path.lower()
class Parser(object):
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 276cb761ef..80d0036a7d 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -99,7 +99,8 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
'--enable-bots' => false,
'--enable-http-errors' => false,
'--enable-http-redirects' => false,
- '--enable-reverse-dns' => false);
+ '--enable-reverse-dns' => false,
+ '--force-lowercase-path' => false);
self::executeLogImporter($logFile, $opts);
}
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index bc73f49c8b..441a7514ee 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -2,59 +2,59 @@
<result>
<row>
<label>blog</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>5</nb_visits>
+ <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <entry_nb_visits>5</entry_nb_visits>
+ <entry_nb_actions>5</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>5</entry_bounce_count>
+ <exit_nb_visits>5</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>category</label>
- <nb_visits>3</nb_visits>
- <nb_hits>3</nb_hits>
+ <nb_visits>4</nb_visits>
+ <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>3</entry_nb_visits>
- <entry_nb_actions>3</entry_nb_actions>
+ <entry_nb_visits>4</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>3</entry_bounce_count>
- <exit_nb_visits>3</exit_nb_visits>
+ <entry_bounce_count>4</entry_bounce_count>
+ <exit_nb_visits>4</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>3</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>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 45f6b4c156..ac3907ad22 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -2,59 +2,59 @@
<result>
<row>
<label>blog</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>5</nb_visits>
+ <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <entry_nb_visits>5</entry_nb_visits>
+ <entry_nb_actions>5</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>5</entry_bounce_count>
+ <exit_nb_visits>5</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>category</label>
- <nb_visits>3</nb_visits>
- <nb_hits>3</nb_hits>
+ <nb_visits>4</nb_visits>
+ <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>3</entry_nb_visits>
- <entry_nb_actions>3</entry_nb_actions>
+ <entry_nb_visits>4</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>3</entry_bounce_count>
- <exit_nb_visits>3</exit_nb_visits>
+ <entry_bounce_count>4</entry_bounce_count>
+ <exit_nb_visits>4</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>3</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>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 2d7babf5e2..cbb38487ea 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>18</nb_visits>
- <nb_hits>18</nb_hits>
+ <nb_visits>19</nb_visits>
+ <nb_hits>19</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>19</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index 83ebace1e2..23dac54cc0 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -2,59 +2,59 @@
<result>
<row>
<label>blog</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
+ <nb_visits>5</nb_visits>
+ <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>4</entry_nb_visits>
- <entry_nb_actions>4</entry_nb_actions>
+ <entry_nb_visits>5</entry_nb_visits>
+ <entry_nb_actions>5</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>5</entry_bounce_count>
+ <exit_nb_visits>5</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>category</label>
- <nb_visits>3</nb_visits>
- <nb_hits>3</nb_hits>
+ <nb_visits>4</nb_visits>
+ <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>3</entry_nb_visits>
- <entry_nb_actions>3</entry_nb_actions>
+ <entry_nb_visits>4</entry_nb_visits>
+ <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>3</entry_bounce_count>
- <exit_nb_visits>3</exit_nb_visits>
+ <entry_bounce_count>4</entry_bounce_count>
+ <exit_nb_visits>4</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</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>2</nb_visits>
- <nb_hits>2</nb_hits>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>2</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>3</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>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
index 5c94d82678..1870fb5eb1 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>24</nb_pageviews>
- <nb_uniq_pageviews>24</nb_uniq_pageviews>
+ <nb_pageviews>25</nb_pageviews>
+ <nb_uniq_pageviews>25</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/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 768aec92f8..0fbb20f515 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -1,5 +1,53 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>Not-Bot</label>
+ <nb_visits>4</nb_visits>
+ <nb_actions>6</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>123</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
+ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <subtable>
+ <row>
+ <label>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</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>123</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Apache-HttpClient/4.2.1 (java 1.5)</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>HTTP-code</label>
<nb_visits>3</nb_visits>
@@ -78,54 +126,6 @@
</row>
</subtable>
</row>
- <row>
- <label>Not-Bot</label>
- <nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>123</sum_visit_length>
- <bounce_count>2</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>5</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>5</revenue>
- <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <subtable>
- <row>
- <label>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</label>
- <nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>123</sum_visit_length>
- <bounce_count>1</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>5</revenue>
- </row>
- </goals>
- <nb_conversions>1</nb_conversions>
- <revenue>5</revenue>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- </row>
- <row>
- <label>Apache-HttpClient/4.2.1 (java 1.5)</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
- </subtable>
- </row>
<row>
<label>Forum status</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index e6257ea020..8eba803a70 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>22</nb_conversions>
+ <nb_conversions>23</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 126898a098..9b53257aa2 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>23</nb_conversions>
+ <nb_conversions>24</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
index a8cf840df7..fc5249168e 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>23</nb_conversions>
- <nb_visits_converted>23</nb_visits_converted>
- <conversion_rate>92</conversion_rate>
- <revenue>115</revenue>
+ <nb_conversions>24</nb_conversions>
+ <nb_visits_converted>24</nb_visits_converted>
+ <conversion_rate>92.31</conversion_rate>
+ <revenue>120</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
index baf2961e16..95d827565a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
- <nb_pageviews>24</nb_pageviews>
- <revenue>115</revenue>
+ <nb_visits>26</nb_visits>
+ <nb_actions>29</nb_actions>
+ <nb_pageviews>25</nb_pageviews>
+ <revenue>120</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 4add2adf42..73d27dd2b7 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
- <nb_pageviews>24</nb_pageviews>
- <revenue>115</revenue>
+ <nb_visits>26</nb_visits>
+ <nb_actions>29</nb_actions>
+ <nb_pageviews>25</nb_pageviews>
+ <revenue>120</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
index d57374a75f..3197c887ed 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>29</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
- <nb_visits_converted>23</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <bounce_count>24</bounce_count>
+ <nb_visits_converted>24</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
<url>http://piwik.org/faq/general/#faq_52</url>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
index b434cb70ab..6d425f1aef 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>23</nb_visits>
- <nb_actions>26</nb_actions>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>21</bounce_count>
+ <bounce_count>22</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>21</nb_conversions>
- <nb_visits_converted>21</nb_visits_converted>
- <revenue>105</revenue>
+ <nb_conversions>22</nb_conversions>
+ <nb_visits_converted>22</nb_visits_converted>
+ <revenue>110</revenue>
</row>
</goals>
- <nb_conversions>21</nb_conversions>
- <revenue>105</revenue>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
+ <nb_conversions>22</nb_conversions>
+ <revenue>110</revenue>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>Websites</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 6ff7c56d3f..5bfd591f8f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>21</nb_visits>
- <nb_actions>24</nb_actions>
+ <nb_visits>22</nb_visits>
+ <nb_actions>25</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>19</bounce_count>
+ <bounce_count>20</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>19</nb_conversions>
- <nb_visits_converted>19</nb_visits_converted>
- <revenue>95</revenue>
+ <nb_conversions>20</nb_conversions>
+ <nb_visits_converted>20</nb_visits_converted>
+ <revenue>100</revenue>
</row>
</goals>
- <nb_conversions>19</nb_conversions>
- <revenue>95</revenue>
- <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
+ <nb_conversions>20</nb_conversions>
+ <revenue>100</revenue>
+ <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<city_name>Unknown</city_name>
<city>xx</city>
<region>xx</region>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 47f5304e2e..676b277cea 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Asia</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</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>8</bounce_count>
+ <bounce_count>9</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>9</nb_conversions>
- <nb_visits_converted>9</nb_visits_converted>
- <revenue>45</revenue>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
</row>
</goals>
- <nb_conversions>9</nb_conversions>
- <revenue>45</revenue>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<code>Asia</code>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 801d8e0f17..14c64c3f03 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Japan</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</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>8</bounce_count>
+ <bounce_count>9</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>9</nb_conversions>
- <nb_visits_converted>9</nb_visits_converted>
- <revenue>45</revenue>
+ <nb_conversions>10</nb_conversions>
+ <nb_visits_converted>10</nb_visits_converted>
+ <revenue>50</revenue>
</row>
</goals>
- <nb_conversions>9</nb_conversions>
- <revenue>45</revenue>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <nb_conversions>10</nb_conversions>
+ <revenue>50</revenue>
+ <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<code>jp</code>
<logo>plugins/UserCountry/flags/jp.png</logo>
<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 52b7d7b2e5..345541d0ce 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,21 +2,21 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>21</nb_visits>
- <nb_actions>24</nb_actions>
+ <nb_visits>22</nb_visits>
+ <nb_actions>25</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>19</bounce_count>
+ <bounce_count>20</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>19</nb_conversions>
- <nb_visits_converted>19</nb_visits_converted>
- <revenue>95</revenue>
+ <nb_conversions>20</nb_conversions>
+ <nb_visits_converted>20</nb_visits_converted>
+ <revenue>100</revenue>
</row>
</goals>
- <nb_conversions>19</nb_conversions>
- <revenue>95</revenue>
- <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
+ <nb_conversions>20</nb_conversions>
+ <revenue>100</revenue>
+ <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<region>xx</region>
<country>xx</country>
<country_name>Unknown</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index 04a749cc4c..07ca0de5ce 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>WebKit (Safari, Chrome)</label>
- <nb_visits>16</nb_visits>
- <nb_actions>19</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>14</bounce_count>
- <nb_visits_converted>15</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+ <bounce_count>15</bounce_count>
+ <nb_visits_converted>16</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
<shortLabel>Webkit</shortLabel>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index f4593f7570..09abd01bbe 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Chrome 11.0</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
<shortLabel>Chrome 11.0</shortLabel>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 53aa99642e..8cd0d5166f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Chrome</label>
- <nb_visits>9</nb_visits>
- <nb_actions>12</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_actions>13</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>8</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <bounce_count>8</bounce_count>
+ <nb_visits_converted>9</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 85558e0b71..c3d42208fb 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>Mac OS / Chrome / unknown</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>
+ </row>
<row>
<label>Linux / Epiphany / unknown</label>
<nb_visits>5</nb_visits>
@@ -10,16 +20,6 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
</row>
- <row>
- <label>Mac OS / Chrome / unknown</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
- </row>
<row>
<label>Windows 7 / Internet Explorer / unknown</label>
<nb_visits>5</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 2d67772cab..657fe9d857 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -2,12 +2,12 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
+ <nb_visits>26</nb_visits>
+ <nb_actions>29</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>23</bounce_count>
- <nb_visits_converted>23</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
+ <bounce_count>24</bounce_count>
+ <nb_visits_converted>24</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 0e314546d9..b9c1b1b60e 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Desktop</label>
- <nb_visits>22</nb_visits>
- <nb_actions>25</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>20</bounce_count>
- <nb_visits_converted>21</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>22</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>
<logo>plugins/UserSettings/images/screens/normal.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 33c33cbdb6..4a8eeb7db7 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -24,13 +24,13 @@
</row>
<row>
<label>Mac</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
index c0a02f0be0..137bbccd22 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -26,13 +26,13 @@
</row>
<row>
<label>Mac OS</label>
- <nb_visits>5</nb_visits>
- <nb_actions>8</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>9</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>3</bounce_count>
- <nb_visits_converted>4</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <bounce_count>4</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/os/MAC.gif</logo>
<shortLabel>Mac OS</shortLabel>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index 95676b0900..d1f2bda02f 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -3,43 +3,43 @@
<row>
<label>Cookie</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
<label>Flash</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
<label>Java</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>10.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
<label>Director</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
<label>Gears</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
<label>Pdf</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Windowsmedia</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>5.3%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 221ab60e13..5240789b82 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>23</nb_visits>
- <nb_actions>26</nb_actions>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>21</bounce_count>
- <nb_visits_converted>21</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
+ <bounce_count>22</bounce_count>
+ <nb_visits_converted>22</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>1024x768</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
index 3d5674e69a..dafbcf6e3a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>23</nb_visits>
- <nb_actions>26</nb_actions>
+ <nb_visits>24</nb_visits>
+ <nb_actions>27</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>21</bounce_count>
- <nb_visits_converted>21</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
+ <bounce_count>22</bounce_count>
+ <nb_visits_converted>22</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 5801fdef61..0202a80040 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -39,11 +39,11 @@
</row>
<row>
<label>Saturday</label>
- <nb_visits>8</nb_visits>
- <bounce_count>6</bounce_count>
- <nb_actions>11</nb_actions>
- <nb_uniq_visitors>8</nb_uniq_visitors>
- <nb_visits_converted>6</nb_visits_converted>
+ <nb_visits>9</nb_visits>
+ <bounce_count>7</bounce_count>
+ <nb_actions>12</nb_actions>
+ <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_visits_converted>7</nb_visits_converted>
<sum_visit_length>305</sum_visit_length>
<day_of_week>6</day_of_week>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index b0895b804d..e22dcdf840 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -202,13 +202,13 @@
</row>
<row>
<label>20h</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</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>6</bounce_count>
+ <nb_visits_converted>6</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>21h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 4587fd327e..c0bde3aaf6 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -283,22 +283,22 @@
</row>
<row>
<label>20h</label>
- <nb_visits>5</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>5</bounce_count>
+ <bounce_count>6</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>5</nb_conversions>
- <nb_visits_converted>5</nb_visits_converted>
- <revenue>25</revenue>
+ <nb_conversions>6</nb_conversions>
+ <nb_visits_converted>6</nb_visits_converted>
+ <revenue>30</revenue>
</row>
</goals>
- <nb_conversions>5</nb_conversions>
- <revenue>25</revenue>
+ <nb_conversions>6</nb_conversions>
+ <revenue>30</revenue>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>21h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 4b7d09807f..2f0f22356d 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>24</nb_visits>
+ <nb_visits>25</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index cb6273cf1f..7b04c38302 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>25</nb_visits>
+ <nb_visits>26</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 6712e1f99e..42b73b8c2d 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>23</nb_visits>
+ <nb_visits>24</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index cf9b4c5620..ab8f9b4b1c 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>23</nb_visits>
+ <nb_visits>24</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index ed30e7d83c..46af1425a3 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>28</result>
\ No newline at end of file
+<result>29</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index f832b0e0c7..5154fe8a28 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>23</result>
\ No newline at end of file
+<result>24</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 4c77f1f6e6..8dda442ff2 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>26</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index f832b0e0c7..5154fe8a28 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>23</result>
\ No newline at end of file
+<result>24</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 4c77f1f6e6..8dda442ff2 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>25</result>
\ No newline at end of file
+<result>26</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 098e1c177e..bee81f96e3 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>25</nb_uniq_visitors>
- <nb_visits>25</nb_visits>
- <nb_actions>28</nb_actions>
- <nb_visits_converted>23</nb_visits_converted>
- <bounce_count>23</bounce_count>
+ <nb_uniq_visitors>26</nb_uniq_visitors>
+ <nb_visits>26</nb_visits>
+ <nb_actions>29</nb_actions>
+ <nb_visits_converted>24</nb_visits_converted>
+ <bounce_count>24</bounce_count>
<sum_visit_length>305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>92%</bounce_rate>
diff --git a/tests/resources/fake_logs_enable_all.log b/tests/resources/fake_logs_enable_all.log
index a8f2a58346..742eb003e6 100755
--- a/tests/resources/fake_logs_enable_all.log
+++ b/tests/resources/fake_logs_enable_all.log
@@ -8,4 +8,4 @@
175.41.192.42 - - [11/Aug/2012:20:12:40 +0200] "GET /other.png 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.192.43 - - [11/Aug/2012:21:12:40 +0200] "GET /moved-permanently HTTP/1.1" 301 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.192.43 - - [11/Aug/2012:21:15:40 +0200] "GET /temp-redirect HTTP/1.1" 307 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.192.41 - - [11/Aug/2012:22:15:41 +0200] "GET /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"
--
GitLab