Skip to content
Extraits de code Groupes Projets
Valider bf2fdd4a rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Fixes #3832, add --force-lowercase-path option to log importer script that... 

Fixes #3832, add --force-lowercase-path option to log importer script that makes all paths lowercase before importing hits.
parent 98658d02
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 213 ajouts et 204 suppressions
misc/log-analytics/import_logs.py
+ 8
− 0
Voir le fichier @ bf2fdd4a
...@@ -399,6 +399,11 @@ class Configuration(object): ...@@ -399,6 +399,11 @@ class Configuration(object):
help="Invalidate reports for the specified dates (format: YYYY-MM-DD,YYYY-MM-DD,...). " 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.", "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 return option_parser
...@@ -1225,6 +1230,9 @@ class Hit(object): ...@@ -1225,6 +1230,9 @@ class Hit(object):
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
setattr(self, key, value) setattr(self, key, value)
super(Hit, self).__init__() super(Hit, self).__init__()
if config.options.force_lowercase_path:
self.full_path = self.full_path.lower()
class Parser(object): class Parser(object):
......
tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+ 2
− 1
Voir le fichier @ bf2fdd4a
...@@ -99,7 +99,8 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture ...@@ -99,7 +99,8 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture
'--enable-bots' => false, '--enable-bots' => false,
'--enable-http-errors' => false, '--enable-http-errors' => false,
'--enable-http-redirects' => false, '--enable-http-redirects' => false,
'--enable-reverse-dns' => false); '--enable-reverse-dns' => false,
'--force-lowercase-path' => false);
self::executeLogImporter($logFile, $opts); self::executeLogImporter($logFile, $opts);
} }
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+ 27
− 27
Voir le fichier @ bf2fdd4a
...@@ -2,59 +2,59 @@ ...@@ -2,59 +2,59 @@
<result> <result>
<row> <row>
<label>blog</label> <label>blog</label>
<nb_visits>4</nb_visits> <nb_visits>5</nb_visits>
<nb_hits>4</nb_hits> <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>4</entry_nb_visits> <entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions> <entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count> <entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits> <exit_nb_visits>5</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>category</label> <label>category</label>
<nb_visits>3</nb_visits> <nb_visits>4</nb_visits>
<nb_hits>3</nb_hits> <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>3</entry_nb_visits> <entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>3</entry_nb_actions> <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>3</entry_bounce_count> <entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>3</exit_nb_visits> <exit_nb_visits>4</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>meta</label> <label>meta</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>/index</label> <label>/index</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_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> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+ 27
− 27
Voir le fichier @ bf2fdd4a
...@@ -2,59 +2,59 @@ ...@@ -2,59 +2,59 @@
<result> <result>
<row> <row>
<label>blog</label> <label>blog</label>
<nb_visits>4</nb_visits> <nb_visits>5</nb_visits>
<nb_hits>4</nb_hits> <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>4</entry_nb_visits> <entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions> <entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count> <entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits> <exit_nb_visits>5</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>category</label> <label>category</label>
<nb_visits>3</nb_visits> <nb_visits>4</nb_visits>
<nb_hits>3</nb_hits> <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>3</entry_nb_visits> <entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>3</entry_nb_actions> <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>3</entry_bounce_count> <entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>3</exit_nb_visits> <exit_nb_visits>4</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>meta</label> <label>meta</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>/index</label> <label>/index</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_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> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+ 3
− 3
Voir le fichier @ bf2fdd4a
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<result> <result>
<row> <row>
<label>Page Name not defined</label> <label>Page Name not defined</label>
<nb_visits>18</nb_visits> <nb_visits>19</nb_visits>
<nb_hits>18</nb_hits> <nb_hits>19</nb_hits>
<sum_time_spent>0</sum_time_spent> <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> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate> <bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate> <exit_rate>0%</exit_rate>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+ 27
− 27
Voir le fichier @ bf2fdd4a
...@@ -2,59 +2,59 @@ ...@@ -2,59 +2,59 @@
<result> <result>
<row> <row>
<label>blog</label> <label>blog</label>
<nb_visits>4</nb_visits> <nb_visits>5</nb_visits>
<nb_hits>4</nb_hits> <nb_hits>5</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>4</entry_nb_visits> <entry_nb_visits>5</entry_nb_visits>
<entry_nb_actions>4</entry_nb_actions> <entry_nb_actions>5</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count> <entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits> <exit_nb_visits>5</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>category</label> <label>category</label>
<nb_visits>3</nb_visits> <nb_visits>4</nb_visits>
<nb_hits>3</nb_hits> <nb_hits>4</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>3</entry_nb_visits> <entry_nb_visits>4</entry_nb_visits>
<entry_nb_actions>3</entry_nb_actions> <entry_nb_actions>4</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>3</entry_bounce_count> <entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>3</exit_nb_visits> <exit_nb_visits>4</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>meta</label> <label>meta</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<avg_time_on_page>0</avg_time_on_page> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
<subtable> <subtable>
<row> <row>
<label>/index</label> <label>/index</label>
<nb_visits>2</nb_visits> <nb_visits>3</nb_visits>
<nb_hits>2</nb_hits> <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent> <sum_time_spent>0</sum_time_spent>
<entry_nb_visits>2</entry_nb_visits> <entry_nb_visits>3</entry_nb_visits>
<entry_nb_actions>2</entry_nb_actions> <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length> <entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>2</entry_bounce_count> <entry_bounce_count>3</entry_bounce_count>
<exit_nb_visits>2</exit_nb_visits> <exit_nb_visits>3</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_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> <avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate> <bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate> <exit_rate>100%</exit_rate>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
+ 2
− 2
Voir le fichier @ bf2fdd4a
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<nb_pageviews>24</nb_pageviews> <nb_pageviews>25</nb_pageviews>
<nb_uniq_pageviews>24</nb_uniq_pageviews> <nb_uniq_pageviews>25</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads> <nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads> <nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks> <nb_outlinks>0</nb_outlinks>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+ 48
− 48
Voir le fichier @ bf2fdd4a
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <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> <row>
<label>HTTP-code</label> <label>HTTP-code</label>
<nb_visits>3</nb_visits> <nb_visits>3</nb_visits>
...@@ -78,54 +126,6 @@ ...@@ -78,54 +126,6 @@
</row> </row>
</subtable> </subtable>
</row> </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> <row>
<label>Forum status</label> <label>Forum status</label>
<nb_visits>1</nb_visits> <nb_visits>1</nb_visits>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+ 1
− 1
Voir le fichier @ bf2fdd4a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<result> <result>
<row> <row>
<label>0 days</label> <label>0 days</label>
<nb_conversions>22</nb_conversions> <nb_conversions>23</nb_conversions>
</row> </row>
<row> <row>
<label>1 day</label> <label>1 day</label>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+ 1
− 1
Voir le fichier @ bf2fdd4a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<result> <result>
<row> <row>
<label>1 visit</label> <label>1 visit</label>
<nb_conversions>23</nb_conversions> <nb_conversions>24</nb_conversions>
</row> </row>
<row> <row>
<label>2 visits</label> <label>2 visits</label>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
+ 4
− 4
Voir le fichier @ bf2fdd4a
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<nb_conversions>23</nb_conversions> <nb_conversions>24</nb_conversions>
<nb_visits_converted>23</nb_visits_converted> <nb_visits_converted>24</nb_visits_converted>
<conversion_rate>92</conversion_rate> <conversion_rate>92.31</conversion_rate>
<revenue>115</revenue> <revenue>120</revenue>
</result> </result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+ 4
− 4
Voir le fichier @ bf2fdd4a
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<result> <result>
<row> <row>
<label>Piwik test</label> <label>Piwik test</label>
<nb_visits>25</nb_visits> <nb_visits>26</nb_visits>
<nb_actions>28</nb_actions> <nb_actions>29</nb_actions>
<nb_pageviews>24</nb_pageviews> <nb_pageviews>25</nb_pageviews>
<revenue>115</revenue> <revenue>120</revenue>
<visits_evolution>100%</visits_evolution> <visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution> <actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution> <pageviews_evolution>100%</pageviews_evolution>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+ 4
− 4
Voir le fichier @ bf2fdd4a
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<result> <result>
<nb_visits>25</nb_visits> <nb_visits>26</nb_visits>
<nb_actions>28</nb_actions> <nb_actions>29</nb_actions>
<nb_pageviews>24</nb_pageviews> <nb_pageviews>25</nb_pageviews>
<revenue>115</revenue> <revenue>120</revenue>
<visits_evolution>100%</visits_evolution> <visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution> <actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution> <pageviews_evolution>100%</pageviews_evolution>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+ 5
− 5
Voir le fichier @ bf2fdd4a
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<result> <result>
<row> <row>
<label>Unknown</label> <label>Unknown</label>
<nb_visits>25</nb_visits> <nb_visits>26</nb_visits>
<nb_actions>28</nb_actions> <nb_actions>29</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>23</bounce_count> <bounce_count>24</bounce_count>
<nb_visits_converted>23</nb_visits_converted> <nb_visits_converted>24</nb_visits_converted>
<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
<url>http://piwik.org/faq/general/#faq_52</url> <url>http://piwik.org/faq/general/#faq_52</url>
</row> </row>
</result> </result>
\ No newline at end of file
tests/PHPUnit/Integration/expected/test_ImportLogs__Referers.getRefererType_month.xml
+ 9
− 9
Voir le fichier @ bf2fdd4a
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<result> <result>
<row> <row>
<label>Direct Entry</label> <label>Direct Entry</label>
<nb_visits>23</nb_visits> <nb_visits>24</nb_visits>
<nb_actions>26</nb_actions> <nb_actions>27</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>21</bounce_count> <bounce_count>22</bounce_count>
<goals> <goals>
<row idgoal='1'> <row idgoal='1'>
<nb_conversions>21</nb_conversions> <nb_conversions>22</nb_conversions>
<nb_visits_converted>21</nb_visits_converted> <nb_visits_converted>22</nb_visits_converted>
<revenue>105</revenue> <revenue>110</revenue>
</row> </row>
</goals> </goals>
<nb_conversions>21</nb_conversions> <nb_conversions>22</nb_conversions>
<revenue>105</revenue> <revenue>110</revenue>
<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
</row> </row>
<row> <row>
<label>Websites</label> <label>Websites</label>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+ 9
− 9
Voir le fichier @ bf2fdd4a
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<result> <result>
<row> <row>
<label>Unknown</label> <label>Unknown</label>
<nb_visits>21</nb_visits> <nb_visits>22</nb_visits>
<nb_actions>24</nb_actions> <nb_actions>25</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>19</bounce_count> <bounce_count>20</bounce_count>
<goals> <goals>
<row idgoal='1'> <row idgoal='1'>
<nb_conversions>19</nb_conversions> <nb_conversions>20</nb_conversions>
<nb_visits_converted>19</nb_visits_converted> <nb_visits_converted>20</nb_visits_converted>
<revenue>95</revenue> <revenue>100</revenue>
</row> </row>
</goals> </goals>
<nb_conversions>19</nb_conversions> <nb_conversions>20</nb_conversions>
<revenue>95</revenue> <revenue>100</revenue>
<sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<city_name>Unknown</city_name> <city_name>Unknown</city_name>
<city>xx</city> <city>xx</city>
<region>xx</region> <region>xx</region>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+ 9
− 9
Voir le fichier @ bf2fdd4a
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<result> <result>
<row> <row>
<label>Asia</label> <label>Asia</label>
<nb_visits>10</nb_visits> <nb_visits>11</nb_visits>
<nb_actions>13</nb_actions> <nb_actions>14</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>8</bounce_count> <bounce_count>9</bounce_count>
<goals> <goals>
<row idgoal='1'> <row idgoal='1'>
<nb_conversions>9</nb_conversions> <nb_conversions>10</nb_conversions>
<nb_visits_converted>9</nb_visits_converted> <nb_visits_converted>10</nb_visits_converted>
<revenue>45</revenue> <revenue>50</revenue>
</row> </row>
</goals> </goals>
<nb_conversions>9</nb_conversions> <nb_conversions>10</nb_conversions>
<revenue>45</revenue> <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<code>Asia</code> <code>Asia</code>
</row> </row>
<row> <row>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+ 9
− 9
Voir le fichier @ bf2fdd4a
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<result> <result>
<row> <row>
<label>Japan</label> <label>Japan</label>
<nb_visits>10</nb_visits> <nb_visits>11</nb_visits>
<nb_actions>13</nb_actions> <nb_actions>14</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>8</bounce_count> <bounce_count>9</bounce_count>
<goals> <goals>
<row idgoal='1'> <row idgoal='1'>
<nb_conversions>9</nb_conversions> <nb_conversions>10</nb_conversions>
<nb_visits_converted>9</nb_visits_converted> <nb_visits_converted>10</nb_visits_converted>
<revenue>45</revenue> <revenue>50</revenue>
</row> </row>
</goals> </goals>
<nb_conversions>9</nb_conversions> <nb_conversions>10</nb_conversions>
<revenue>45</revenue> <revenue>50</revenue>
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
<code>jp</code> <code>jp</code>
<logo>plugins/UserCountry/flags/jp.png</logo> <logo>plugins/UserCountry/flags/jp.png</logo>
<logoWidth>16</logoWidth> <logoWidth>16</logoWidth>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+ 9
− 9
Voir le fichier @ bf2fdd4a
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
<result> <result>
<row> <row>
<label>Unknown</label> <label>Unknown</label>
<nb_visits>21</nb_visits> <nb_visits>22</nb_visits>
<nb_actions>24</nb_actions> <nb_actions>25</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>19</bounce_count> <bounce_count>20</bounce_count>
<goals> <goals>
<row idgoal='1'> <row idgoal='1'>
<nb_conversions>19</nb_conversions> <nb_conversions>20</nb_conversions>
<nb_visits_converted>19</nb_visits_converted> <nb_visits_converted>20</nb_visits_converted>
<revenue>95</revenue> <revenue>100</revenue>
</row> </row>
</goals> </goals>
<nb_conversions>19</nb_conversions> <nb_conversions>20</nb_conversions>
<revenue>95</revenue> <revenue>100</revenue>
<sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
<region>xx</region> <region>xx</region>
<country>xx</country> <country>xx</country>
<country_name>Unknown</country_name> <country_name>Unknown</country_name>
......
tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+ 5
− 5
Voir le fichier @ bf2fdd4a
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<result> <result>
<row> <row>
<label>WebKit (Safari, Chrome)</label> <label>WebKit (Safari, Chrome)</label>
<nb_visits>16</nb_visits> <nb_visits>17</nb_visits>
<nb_actions>19</nb_actions> <nb_actions>20</nb_actions>
<max_actions>3</max_actions> <max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length> <sum_visit_length>305</sum_visit_length>
<bounce_count>14</bounce_count> <bounce_count>15</bounce_count>
<nb_visits_converted>15</nb_visits_converted> <nb_visits_converted>16</nb_visits_converted>
<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
<shortLabel>Webkit</shortLabel> <shortLabel>Webkit</shortLabel>
</row> </row>
<row> <row>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter