From bf2fdd4aa997fbae4ad7ade43d383f7947afe77c Mon Sep 17 00:00:00 2001 From: diosmosis 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 3be72a186ca..b7012449e08 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -399,6 +399,11 @@ def _create_parser(self): 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 @@ def __init__(self, **kwargs): 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 276cb761ef7..80d0036a7db 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -99,7 +99,8 @@ private function logVisitsWithAllEnabled() '--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 bc73f49c8bc..441a7514ee7 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 @@ - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 100% 100% - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 - 2 - 2 - 2 + 3 + 3 + 3 + 3 + 3 0 100% 100% 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 45f6b4c1561..ac3907ad228 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 @@ - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 100% 100% - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 - 2 - 2 - 2 + 3 + 3 + 3 + 3 + 3 0 100% 100% 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 2d7babf5e2c..cbb38487ead 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 @@ - 18 - 18 + 19 + 19 0 - 18 + 19 0 0% 0% 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 83ebace1e2b..23dac54cc0f 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 @@ - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 - 4 - 4 + 5 + 5 0 100% 100% - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 - 3 - 3 + 4 + 4 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 100% 100% - 2 - 2 + 3 + 3 0 - 2 - 2 + 3 + 3 0 - 2 - 2 - 2 - 2 - 2 + 3 + 3 + 3 + 3 + 3 0 100% 100% 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 5c94d826782..1870fb5eb1c 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 @@ - 24 - 24 + 25 + 25 4 4 0 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 768aec92f8a..0fbb20f5156 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 @@ + + + 4 + 6 + 3 + 123 + 3 + + + 2 + 2 + 10 + + + 2 + 10 + 4 + + + + 3 + 5 + 3 + 123 + 2 + + + 2 + 2 + 10 + + + 2 + 10 + 3 + + + + 1 + 1 + 1 + 0 + 1 + 0 + 1 + + + 3 @@ -78,54 +126,6 @@ - - - 3 - 5 - 3 - 123 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 3 - - - - 2 - 4 - 3 - 123 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 2 - - - - 1 - 1 - 1 - 0 - 1 - 0 - 1 - - - 1 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 e6257ea0202..8eba803a706 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 @@ - 22 + 23 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 126898a098f..9b53257aa21 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 @@ - 23 + 24 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 a8cf840df73..fc5249168e1 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 @@ - 23 - 23 - 92 - 115 + 24 + 24 + 92.31 + 120 \ 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 baf2961e16a..95d827565af 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 @@ - 25 - 28 - 24 - 115 + 26 + 29 + 25 + 120 100% 100% 100% 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 4add2adf423..73d27dd2b7e 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 @@ - 25 - 28 - 24 - 115 + 26 + 29 + 25 + 120 100% 100% 100% 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 d57374a75f3..3197c887ed4 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 @@ - 25 - 28 + 26 + 29 3 305 - 23 - 23 - 25 + 24 + 24 + 26 http://piwik.org/faq/general/#faq_52 \ 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 b434cb70aba..6d425f1aef3 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 @@ - 23 - 26 + 24 + 27 3 305 - 21 + 22 - 21 - 21 - 105 + 22 + 22 + 110 - 21 - 105 - 23 + 22 + 110 + 24 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 6ff7c56d3f0..5bfd591f8f2 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 @@ - 21 - 24 + 22 + 25 3 305 - 19 + 20 - 19 - 19 - 95 + 20 + 20 + 100 - 19 - 95 - 21 + 20 + 100 + 22 Unknown xx xx 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 47f5304e2e3..676b277ceae 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 @@ - 10 - 13 + 11 + 14 3 305 - 8 + 9 - 9 - 9 - 45 + 10 + 10 + 50 - 9 - 45 - 10 + 10 + 50 + 11 Asia 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 801d8e0f17b..14c64c3f03f 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 @@ - 10 - 13 + 11 + 14 3 305 - 8 + 9 - 9 - 9 - 45 + 10 + 10 + 50 - 9 - 45 - 10 + 10 + 50 + 11 jp plugins/UserCountry/flags/jp.png 16 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 52b7d7b2e56..345541d0ce1 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 @@ - 21 - 24 + 22 + 25 3 305 - 19 + 20 - 19 - 19 - 95 + 20 + 20 + 100 - 19 - 95 - 21 + 20 + 100 + 22 xx xx Unknown 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 04a749cc4c9..07ca0de5ce5 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 @@ - 16 - 19 + 17 + 20 3 305 - 14 - 15 - 16 + 15 + 16 + 17 Webkit 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 f4593f75700..09abd01bbed 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 @@ - 5 - 8 + 6 + 9 3 305 - 3 - 4 - 5 + 4 + 5 + 6 plugins/UserSettings/images/browsers/CH.gif Chrome 11.0 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 53aa99642ee..8cd0d5166fb 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 @@ - 9 - 12 + 10 + 13 3 305 - 7 - 8 - 9 + 8 + 9 + 10 plugins/UserSettings/images/browsers/CH.gif 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 85558e0b71f..c3d42208fb3 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 @@ + + + 6 + 9 + 3 + 305 + 4 + 5 + 6 + 5 @@ -10,16 +20,6 @@ 5 5 - - - 5 - 8 - 3 - 305 - 3 - 4 - 5 - 5 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 2d67772cabd..657fe9d857f 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 @@ - 25 - 28 + 26 + 29 3 305 - 23 - 23 - 25 + 24 + 24 + 26 \ 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 0e314546d98..b9c1b1b60ee 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 @@ - 22 - 25 + 23 + 26 3 305 - 20 - 21 - 22 + 21 + 22 + 23 plugins/UserSettings/images/screens/normal.gif 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 33c33cbdb6e..4a8eeb7db70 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 @@ - 5 - 8 + 6 + 9 3 305 - 3 - 4 - 5 + 4 + 5 + 6 plugins/UserSettings/images/os/MAC.gif 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 c0a02f0be00..137bbccd22b 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 @@ - 5 - 8 + 6 + 9 3 305 - 3 - 4 - 5 + 4 + 5 + 6 plugins/UserSettings/images/os/MAC.gif Mac OS 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 95676b0900e..d1f2bda02f8 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 @@ 2 - 10.5% + 10% plugins/UserSettings/images/plugins/cookie.gif 2 - 10.5% + 10% plugins/UserSettings/images/plugins/flash.gif 2 - 10.5% + 10% plugins/UserSettings/images/plugins/java.gif 1 - 5.3% + 5% plugins/UserSettings/images/plugins/director.gif 1 - 5.3% + 5% plugins/UserSettings/images/plugins/gears.gif 1 - 5.3% + 5% plugins/UserSettings/images/plugins/pdf.gif 1 - 5.3% + 5% plugins/UserSettings/images/plugins/windowsmedia.gif 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 221ab60e131..5240789b821 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 @@ - 23 - 26 + 24 + 27 3 305 - 21 - 21 - 23 + 22 + 22 + 24 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 3d5674e69ae..dafbcf6e3a0 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 @@ - 23 - 26 + 24 + 27 3 305 - 21 - 21 - 23 + 22 + 22 + 24 plugins/UserSettings/images/screens/unknown.gif 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 5801fdef611..0202a80040e 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 @@ - 8 - 6 - 11 - 8 - 6 + 9 + 7 + 12 + 9 + 7 305 6 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 b0895b804d5..e22dcdf8406 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 @@ - 5 - 5 + 6 + 6 1 0 - 5 - 5 - 5 + 6 + 6 + 6 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 4587fd327e6..c0bde3aaf6b 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 @@ - 5 - 5 + 6 + 6 1 0 - 5 + 6 - 5 - 5 - 25 + 6 + 6 + 30 - 5 - 25 + 6 + 30 0 - 5 + 6 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 4b7d09807ff..2f0f22356d5 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 @@ - 24 + 25 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 cb6273cf1f8..7b04c383025 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 @@ - 25 + 26 100% 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 6712e1f99e6..42b73b8c2dc 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 @@ - 23 + 24 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 cf9b4c56205..ab8f9b4b1cf 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 @@ - 23 + 24 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 ed30e7d83c0..46af1425a39 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 @@ -28 \ No newline at end of file +29 \ 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 f832b0e0c74..5154fe8a288 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 @@ -23 \ No newline at end of file +24 \ 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 4c77f1f6e60..8dda442ff25 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 @@ -25 \ No newline at end of file +26 \ 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 f832b0e0c74..5154fe8a288 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 @@ -23 \ No newline at end of file +24 \ 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 4c77f1f6e60..8dda442ff25 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 @@ -25 \ No newline at end of file +26 \ 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 098e1c177e9..bee81f96e3c 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 @@ - 25 - 25 - 28 - 23 - 23 + 26 + 26 + 29 + 24 + 24 305 3 92% diff --git a/tests/resources/fake_logs_enable_all.log b/tests/resources/fake_logs_enable_all.log index a8f2a583461..742eb003e64 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"