diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py
index 3be72a186ca717dec3df0610a23cc91141d96d3b..b7012449e08ef4b7b7cbc0118d0c8907adb2806b 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 276cb761ef7d9241d0c297c5a838ee8b6a7b40d3..80d0036a7db2f8bc5767ae1b78b3d90e1e660978 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 bc73f49c8bcec1ca48473e8dc9b193c715035202..441a7514ee7b7d69611d4fd3ad4100e3a135c40b 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 45f6b4c156192dd67e7807adbb1b9e2948c1f75e..ac3907ad2280589653ef1833d7a17ecc37687a18 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 2d7babf5e2c397f927920cd8b22f21e70c75062f..cbb38487ead45d5ec9ad98418b5c5b637d8bdcf2 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 83ebace1e2bb7812bdd7d7a00e49ce1400e2bfa6..23dac54cc0fb788dace9748e1a1478bad84a1e58 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 5c94d82678299e9231c45bbcf1f4004689b97a50..1870fb5eb1cc3d460a138e0a9b9d8aa9bf8c124e 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 768aec92f8ab61fded183d55f6fafd1647ea9f19..0fbb20f5156839d1a0d32f742e755942d8387e45 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 e6257ea020269e2fb7f8316c669defcc46f42576..8eba803a706679486724282f82c7ad9d0dd92a61 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 126898a098ffab3bd6b603a3963713bbcec80f17..9b53257aa21949f3c068f137af25999abfe5034d 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 a8cf840df7379ffec560da1323ffa76647cff9f4..fc5249168e121f178e5574845122d925903bd391 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 baf2961e16aefafbf61a52e5f5714186f658538d..95d827565af399ae453ec26bc9cfd1dc9d1fbe3f 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 4add2adf42345dcc1fed4c9b2603b617bae8bfe9..73d27dd2b7ec9a23cfe7ffd9ddede1d380c3d972 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 d57374a75f3f8e9e1a89356dcca86fbafb3faf5e..3197c887ed4eea74610daceea708837215fbf43d 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 b434cb70abaaf2c97a7d25aa44fb1075da59e796..6d425f1aef3ea066c66b477e6e055433532f60a4 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 6ff7c56d3f056d65fd1cc9ecead28301fc9316ba..5bfd591f8f2bcfa82c79b0a16cabb1328d66376a 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 47f5304e2e31886e0e78f7f71349bd0f02610c16..676b277ceaefe136c3e130c24e2d04076c87dab6 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 801d8e0f17be261be74829548e9929cc706702fb..14c64c3f03f0df2557d7203792e9510399391bba 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 52b7d7b2e56e74b7f2314e99248ecc8eadf56a5c..345541d0ce1d7d69aeb8410755bd33393bc802c4 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 04a749cc4c9024da4a82f9021f2f57ff33c0fc2c..07ca0de5ce5008f5c0eba868ef1c3fd4ba03e298 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 f4593f757000e7c2a89be5618d303c649075933a..09abd01bbedc7d91dad9f1016e7316759475a215 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 53aa99642ee0be0a7c67efb00ffd13106733f677..8cd0d5166fbfe84f32c628ca82b21acc8eb7e338 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 85558e0b71f52c0303050148daae6c56f54135c0..c3d42208fb34fc1e32e163fa4bdaed464609aef7 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 2d67772cabdb50a13a8cca7409f651a18c3461ec..657fe9d857fff32ab8d2e2c08fb41ae236abad3c 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 0e314546d9843f5bf14750546ec77294355db6ac..b9c1b1b60eeac7241b0b21268d257949d7512082 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 33c33cbdb6ebe5e86edaee9ef9d1db87dd286637..4a8eeb7db703de691bac42b86c172eb889d3e228 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 c0a02f0be00e5cb794dd75bb5c3677ceca1ffb26..137bbccd22b5995364434919e5d930b47cc43d3c 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 95676b0900eccc9cba546e0c8cbd33b59f8b69f3..d1f2bda02f845e12d58773f02ccd73b84b1aea69 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 221ab60e1310cf2c487bc75f0fe22e627fb3128a..5240789b82192d17e4348580a27f912f736a0f64 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 3d5674e69aec700dcac91cc40a434f58469d509c..dafbcf6e3a0b94cadb59f9f8ab77bb14d09c27f0 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 5801fdef6116c08a0bb433cd3aa595312f611122..0202a80040eb8065ec5f110b53f19a43608b683b 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 b0895b804d534a03fe4bddeb3b477ecc0cbb0606..e22dcdf8406a92423bd89d0b76a3dddef317cfec 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 4587fd327e6e9cd97249c329232364d5042d1044..c0bde3aaf6b3d5e928138669333ad68a6bd240b5 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 4b7d09807ff879b827cbb2ee27c8ba20cf8aef36..2f0f22356d5979ed77a5da577bb8486ef9314711 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 cb6273cf1f8f79a4bf28992cf3aa404b937b3837..7b04c38302544e0092044d36e4187e3396830da1 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 6712e1f99e620696ee1f8000664f5d4a86a1d654..42b73b8c2dcd7712546977ef6d9f3a3a6c042bc4 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 cf9b4c562054ae49354e2c2d944d5e9155d8abe4..ab8f9b4b1cf79a2633ea9158e62bc5b175248fba 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 ed30e7d83c02f9cbb7170c97ca1fa6f4ab5ebef4..46af1425a39189f6792635a1df8c5b1f72b6aa34 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 f832b0e0c74993b6b6ce1ca82ddf1c18f5fb04b7..5154fe8a2883f0949460ee9bf629b4494c38cb70 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 4c77f1f6e6033e2c861e4fa18a79df304b9fdb8e..8dda442ff25ced24909f590648996b926fa45274 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 f832b0e0c74993b6b6ce1ca82ddf1c18f5fb04b7..5154fe8a2883f0949460ee9bf629b4494c38cb70 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 4c77f1f6e6033e2c861e4fa18a79df304b9fdb8e..8dda442ff25ced24909f590648996b926fa45274 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 098e1c177e921b431d408d0c6944a7875a6be047..bee81f96e3c737ffc5e7f62f65df3b9039b1bdfe 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 a8f2a58346105956a3efa951a9b39b8b2173a965..742eb003e649efcb382fe407de7eca5ce20a71d7 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"