diff options
| author | Benaka <benakamoorthi@fastmail.fm> | 2014-12-09 07:24:14 +0300 |
|---|---|---|
| committer | Benaka <benakamoorthi@fastmail.fm> | 2014-12-09 07:24:14 +0300 |
| commit | dc5c3efc80d31a44a0ad00fc0199dcf20a20e146 (patch) | |
| tree | 5a6fe64e1cefc1ac3299464da080157cc8d7d4d9 | |
| parent | c9aace86cd4eda164f1c6751bec38e8c59f54167 (diff) | |
| parent | 398f4a90b6f967f8736a27428d404d0c93e975ba (diff) | |
Merge pull request #6825 from piwik/iis_advanced_log_importing
Added IIS advanced log importing support, netscaler log importing support, support for cs-username IIS log field and time-taken IIS log field to log importer script.
79 files changed, 3944 insertions, 604 deletions
diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 7b46ea3e11..5929f3caa1 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -189,37 +189,55 @@ class RegexFormat(BaseFormat): class IisFormat(RegexFormat): + fields = { + 'date': '(?P<date>^\d+[-\d+]+', + 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together not sure how to fix ATM. + 'cs-uri-stem': '(?P<path>/\S*)', + 'cs-uri-query': '(?P<query_string>\S*)', + 'c-ip': '"?(?P<ip>[\d*.]*)"?', + 'cs(User-Agent)': '(?P<user_agent>".*?"|\S+)', + 'cs(Referer)': '(?P<referrer>\S+)', + 'sc-status': '(?P<status>\d+)', + 'sc-bytes': '(?P<length>\S+)', + 'cs-host': '(?P<host>\S+)', + 'cs-username': '(?P<userid>\S+)', + 'time-taken': '(?P<generation_time_milli>\d+)' + } + def __init__(self): super(IisFormat, self).__init__('iis', None, '%Y-%m-%d %H:%M:%S') def check_format(self, file): - line = file.readline() - if not line.startswith('#Software: Microsoft Internet Information Services '): + header_lines = [file.readline() for i in xrange(3)] + + if not header_lines[0].startswith('#'): file.seek(0) return - # Skip the next 2 lines. - for i in xrange(2): - file.readline() - # Parse the 4th line (regex) + + # Parse the 4th 'Fields: ' line to create the regex to use full_regex = [] line = file.readline() - fields = { - 'date': '(?P<date>^\d+[-\d+]+', - 'time': '[\d+:]+)', - 'cs-uri-stem': '(?P<path>/\S*)', - 'cs-uri-query': '(?P<query_string>\S*)', - 'c-ip': '(?P<ip>[\d*.]*)', - 'cs(User-Agent)': '(?P<user_agent>\S+)', - 'cs(Referer)': '(?P<referrer>\S+)', - 'sc-status': '(?P<status>\d+)', - 'sc-bytes': '(?P<length>\S+)', - 'cs-host': '(?P<host>\S+)', - } + + expected_fields = IisFormat.fields.copy() # turn custom field mapping into field => regex mapping + for mapped_field_name, field_name in config.options.custom_iis_fields.iteritems(): + expected_fields[mapped_field_name] = IisFormat.fields[field_name] + del expected_fields[field_name] + + # if the --iis-time-taken-secs option is used, make sure the time-taken field is interpreted as seconds + if config.options.iis_time_taken_in_secs: + expected_fields['time-taken'] = '(?P<generation_time_secs>\S+)' + else: + # check if we're importing netscaler logs and if so, issue a warning + if 'netscaler' in header_lines[1].lower(): + logging.info("WARNING: netscaler log file being parsed without --iis-time-taken-secs option. Netscaler" + " stores second values in the time-taken field. If your logfile does this, the aforementioned" + " option must be used in order to get accurate generation times.") + # Skip the 'Fields: ' prefix. line = line[9:] for field in line.split(): try: - regex = fields[field] + regex = expected_fields[field] except KeyError: regex = '\S+' full_regex.append(regex) @@ -485,8 +503,36 @@ class Configuration(object): '--download-extensions', dest='download_extensions', default=None, help="By default Piwik tracks as Downloads the most popular file extensions. If you set this parameter (format: pdf,doc,...) then files with an extension found in the list will be imported as Downloads, other file extensions downloads will be skipped." ) + option_parser.add_option( + '--iis-map-field', action='callback', callback=self._set_iis_field_map, type='string', + help="Map a custom log entry field in your IIS log to a default one. Use this option to load custom IIS log " + "files such as those from the Advanced Logging IIS module. Used as, eg, --iis-map-field my-date=date. " + "Recognized default fields include: %s" % (', '.join(IisFormat.fields.keys())) + ) + option_parser.add_option( + '--iis-time-taken-secs', action='store_true', default=False, dest='iis_time_taken_in_secs', + help="If set, interprets the time-taken IIS log field as a number of seconds. This must be set for importing" + " netscaler logs." + ) return option_parser + def _set_iis_field_map(self, option, opt_str, value, parser): + parts = value.split('=') + + if len(parts) != 2: + fatal_error("Invalid --iis-map-field option: '%s'" % value) + + custom_name, default_name = parts + + if default_name not in IisFormat.fields: + fatal_error("custom IIS field mapping error: don't know how to parse and use the '%' field" % default_name) + return + + if not hasattr(parser.values, 'custom_iis_fields'): + parser.values.custom_iis_fields = {} + + parser.values.custom_iis_fields[custom_name] = default_name + def _parse_args(self, option_parser): """ Parse the command line args and create self.options and self.filenames. @@ -500,6 +546,9 @@ class Configuration(object): print(option_parser.format_help()) sys.exit(1) + if not hasattr(self.options, 'custom_iis_fields'): + self.options.custom_iis_fields = {} + # Configure logging before calling logging.{debug,info}. logging.basicConfig( format='%(asctime)s: [%(levelname)s] %(message)s', @@ -1250,8 +1299,9 @@ class Recorder(object): 'cdt': self.date_to_piwik(hit.date), 'idsite': site_id, 'dp': '0' if config.options.reverse_dns else '1', - 'ua': hit.user_agent.encode('utf8'), + 'ua': hit.user_agent.encode('utf8') } + if config.options.replay_tracking: # prevent request to be force recorded when option replay-tracking args['rec'] = '0' @@ -1507,6 +1557,9 @@ class Parser(object): limit = 100000 while not format and lineno < limit: line = file.readline() + if not line: # if at eof, don't keep looping + break + lineno = lineno + 1 logging.debug("Detecting format against line %i" % lineno) @@ -1625,6 +1678,11 @@ class Parser(object): try: hit.user_agent = format.get('user_agent') + + # in case a format parser included enclosing quotes, remove them so they are not + # sent to Piwik + if hit.user_agent.startswith('"'): + hit.user_agent = hit.user_agent[1:-1] except BaseFormatException: hit.user_agent = '' @@ -1641,7 +1699,10 @@ class Parser(object): try: hit.generation_time_milli = int(format.get('generation_time_micro')) / 1000 except BaseFormatException: - hit.generation_time_milli = 0 + try: + hit.generation_time_milli = int(format.get('generation_time_secs')) * 1000 + except BaseFormatException: + hit.generation_time_milli = 0 if config.options.log_hostname: hit.host = config.options.log_hostname @@ -1652,6 +1713,16 @@ class Parser(object): # Some formats have no host. pass + # Add userid + try: + hit.userid = None + + userid = format.get('userid') + if userid != '-': + hit.args['uid'] = userid + except: + pass + # Check if the hit must be excluded. if not all((method(hit) for method in self.check_methods)): continue diff --git a/misc/log-analytics/tests/logs/iis_custom.log b/misc/log-analytics/tests/logs/iis_custom.log new file mode 100644 index 0000000000..73797b64dd --- /dev/null +++ b/misc/log-analytics/tests/logs/iis_custom.log @@ -0,0 +1,7 @@ +#Software: IIS Advanced Logging Module +#Version: 1.0 +#Start-Date: 2014-11-18 00:00:00.128 +#Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS +2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 - "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109 +2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 - "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0 +2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359 diff --git a/misc/log-analytics/tests/logs/netscaler.log b/misc/log-analytics/tests/logs/netscaler.log new file mode 100644 index 0000000000..380c09d2c4 --- /dev/null +++ b/misc/log-analytics/tests/logs/netscaler.log @@ -0,0 +1,5 @@ +#Version: 1.0 +#Software: Netscaler Web Logging(NSWL) +#Date: 2014-02-18 11:55:13 +#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 1 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 37af5eee8f..89c28dfe4f 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -1,6 +1,7 @@ # vim: et sw=4 ts=4: import functools import os +import datetime import import_logs @@ -23,6 +24,7 @@ def tearDownModule(): def test_format_detection(): def _test(format_name): file = open('logs/%s.log' % format_name) + import_logs.config = Config() format = import_logs.Parser.detect_format(file) assert(format is not None) assert(format.name == format_name) @@ -31,6 +33,7 @@ def test_format_detection(): tmp_path = add_junk_to_file('logs/%s.log' % format_name) file = open(tmp_path) + import_logs.config = Config() format = import_logs.Parser.detect_format(file) assert(format is not None) assert(format.name == format_name) @@ -64,6 +67,8 @@ class Options(object): included_paths = [] enable_http_errors = False download_extensions = 'doc,pdf' + custom_iis_fields = {} + iis_time_taken_in_secs = False class Config(object): """Mock configuration.""" @@ -183,6 +188,8 @@ def test_replay_tracking_arguments(): def parse_log_file_line(format_name, file_): format = import_logs.FORMATS[format_name] + import_logs.config.options.custom_iis_fields = {} + file = open(file_) match = format.check_format(file) file.close() @@ -226,7 +233,8 @@ def check_iis_groups(groups): assert groups['host'] == 'example.com' expected_hit_properties = ['date', 'path', 'query_string', 'ip', 'referrer', 'user_agent', - 'status', 'length', 'host'] + 'status', 'length', 'host', 'userid', 'generation_time_milli'] + for property_name in groups.keys(): assert property_name in expected_hit_properties @@ -277,10 +285,127 @@ def test_format_parsing(): yield f f = functools.partial(_test_with_junk, format_name, 'logs/' + format_name + '.log') - f.description = 'Testing parsin of format "%s" with junk appended to path' % format_name + f.description = 'Testing parsing of format "%s" with junk appended to path' % format_name yield f f = functools.partial(_test, 'common', 'logs/ncsa_extended.log') f.description = 'Testing parsing of format "common" with ncsa_extended log' yield f + +def test_iis_custom_format(): + """test IIS custom format name parsing.""" + + file_ = 'logs/iis_custom.log' + + # have to override previous globals override for this test + import_logs.config.options.custom_iis_fields = { + 'date-local': 'date', + 'time-local': 'time', + 'cs(Host)': 'cs-host', + 'TimeTakenMS': 'time-taken' + } + Recorder.recorders = [] + import_logs.parser = import_logs.Parser() + import_logs.config.format = None + import_logs.config.options.enable_http_redirects = True + import_logs.config.options.enable_http_errors = True + import_logs.config.options.replay_tracking = False + import_logs.parser.parse(file_) + + hits = [hit.__dict__ for hit in Recorder.recorders] + + assert hits[0]['status'] == '200' + assert hits[0]['is_error'] == False + assert hits[0]['extension'] == u'/products/theproduct' + assert hits[0]['is_download'] == False + assert hits[0]['referrer'] == u'"http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en"' + assert hits[0]['args'] == {} + assert hits[0]['generation_time_milli'] == 109 + assert hits[0]['host'] == 'foo' + assert hits[0]['filename'] == 'logs/iis_custom.log' + assert hits[0]['is_redirect'] == False + assert hits[0]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[0]['lineno'] == 4 + assert hits[0]['ip'] == u'70.95.0.0' + assert hits[0]['query_string'] == '' + assert hits[0]['path'] == u'/Products/theProduct' + assert hits[0]['is_robot'] == False + assert hits[0]['full_path'] == u'/Products/theProduct' + assert hits[0]['user_agent'] == u'Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36' + + assert hits[1]['status'] == u'301' + assert hits[1]['is_error'] == False + assert hits[1]['extension'] == u'/topic/hw43061' + assert hits[1]['is_download'] == False + assert hits[1]['referrer'] == '' + assert hits[1]['args'] == {} + assert hits[1]['generation_time_milli'] == 0 + assert hits[1]['host'] == 'foo' + assert hits[1]['filename'] == 'logs/iis_custom.log' + assert hits[1]['is_redirect'] == True + assert hits[1]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[1]['lineno'] == 5 + assert hits[1]['ip'] == '70.95.32.0' + assert hits[1]['query_string'] == '' + assert hits[1]['path'] == u'/Topic/hw43061' + assert hits[1]['is_robot'] == False + assert hits[1]['full_path'] == u'/Topic/hw43061' + assert hits[1]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36' + + assert hits[2]['status'] == u'404' + assert hits[2]['is_error'] == True + assert hits[2]['extension'] == u'/hello/world/6,681965' + assert hits[2]['is_download'] == False + assert hits[2]['referrer'] == '' + assert hits[2]['args'] == {} + assert hits[2]['generation_time_milli'] == 359 + assert hits[2]['host'] == 'foo' + assert hits[2]['filename'] == 'logs/iis_custom.log' + assert hits[2]['is_redirect'] == False + assert hits[2]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[2]['lineno'] == 6 + assert hits[2]['ip'] == u'173.5.0.0' + assert hits[2]['query_string'] == '' + assert hits[2]['path'] == u'/hello/world/6,681965' + assert hits[2]['is_robot'] == False + assert hits[2]['full_path'] == u'/hello/world/6,681965' + assert hits[2]['user_agent'] == u'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36' + +def test_netscaler_parsing(): + """test parsing of netscaler logs (which are similar to IIS logs)""" + + file_ = 'logs/netscaler.log' + + # have to override previous globals override for this test + import_logs.config.options.custom_iis_fields = {} + Recorder.recorders = [] + import_logs.parser = import_logs.Parser() + import_logs.config.format = None + import_logs.config.options.enable_http_redirects = True + import_logs.config.options.enable_http_errors = True + import_logs.config.options.replay_tracking = False + import_logs.config.options.iis_time_taken_in_secs = True + import_logs.parser.parse(file_) + + hits = [hit.__dict__ for hit in Recorder.recorders] + + assert hits[0]['status'] == u'302' + assert hits[0]['userid'] == None + assert hits[0]['is_error'] == False + assert hits[0]['extension'] == u'jsp' + assert hits[0]['is_download'] == False + assert hits[0]['referrer'] == '' + assert hits[0]['args'] == {} + assert hits[0]['generation_time_milli'] == 1000 + assert hits[0]['host'] == 'foo' + assert hits[0]['filename'] == 'logs/netscaler.log' + assert hits[0]['is_redirect'] == True + assert hits[0]['date'] == datetime.datetime(2012, 8, 16, 11, 55, 13) + assert hits[0]['lineno'] == 4 + assert hits[0]['ip'] == u'172.20.1.0' + assert hits[0]['query_string'] == '' + assert hits[0]['path'] == u'/Citrix/XenApp/Wan/auth/login.jsp' + assert hits[0]['is_robot'] == False + assert hits[0]['full_path'] == u'/Citrix/XenApp/Wan/auth/login.jsp' + assert hits[0]['user_agent'] == u'Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022)'
\ No newline at end of file diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index e72708a11d..365527e280 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -27,6 +27,8 @@ class ManySitesImportedLogs extends Fixture public $segments = null; // should be array mapping segment name => segment definition public $addSegments = false; + public $includeIisWithCustom = false; + public $includeNetscaler = false; public static function createAccessInstance() { @@ -111,6 +113,14 @@ class ManySitesImportedLogs extends Fixture $this->logVisitsWithAllEnabled(); $this->replayLogFile(); $this->logCustomFormat(); + + if ($this->includeIisWithCustom) { + $this->logIisWithCustomFormat(); + } + + if ($this->includeNetscaler) { + $this->logNetscaler(); + } } private function setupSegments() @@ -229,4 +239,32 @@ class ManySitesImportedLogs extends Fixture self::executeLogImporter($logFile, $opts); } + + private function logIisWithCustomFormat() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(), + '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host', 'TimeTakenMS=time-taken'), + '--enable-http-errors' => false, + '--enable-http-redirects' => false); + + self::executeLogImporter($logFile, $opts); + } + + private function logNetscaler() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_netscaler.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(), + '--iis-map-field' => array(), + '--enable-http-redirects' => false); + + $output = self::executeLogImporter($logFile, $opts); + + // make sure warning about --iis-time-taken-secs appears in importer output + self::assertContains("WARNING: netscaler log file being parsed without --iis-time-taken-secs option.", implode("\n", $output)); + } }
\ No newline at end of file diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 693b76e280..a2d6a6327a 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -758,12 +758,18 @@ class Fixture extends \PHPUnit_Framework_Assert . '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files ; - foreach ($options as $name => $value) { - $cmd .= $name; - if ($value !== false) { - $cmd .= '="' . $value . '"'; + foreach ($options as $name => $values) { + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $value) { + $cmd .= $name; + if ($value !== false) { + $cmd .= '="' . $value . '"'; + } + $cmd .= ' '; } - $cmd .= ' '; } $cmd .= '"' . $logFile . '" 2>&1'; diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 44c6b7b0b9..b13317b68f 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -102,4 +102,6 @@ class ImportLogsTest extends SystemTestCase } } -ImportLogsTest::$fixture = new ManySitesImportedLogs();
\ No newline at end of file +ImportLogsTest::$fixture = new ManySitesImportedLogs(); +ImportLogsTest::$fixture->includeIisWithCustom = true; +ImportLogsTest::$fixture->includeNetscaler = true;
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 77e2b64918..b979b765d8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -2,16 +2,21 @@ <result> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label> URL = http://piwik.net/moved-permanently</label> @@ -32,23 +37,51 @@ </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -60,6 +93,44 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> </row> </subtable> </row> @@ -68,6 +139,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -76,6 +150,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label> URL = http://piwik.net/to-an-error</label> @@ -101,6 +176,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -112,12 +190,16 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> <row> <label> Piwik Forums</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -129,5 +211,6 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml index 2d81bb9f19..81d66a066b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -22,30 +22,9 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> - <label> Log Analytics - Analytics - Piwik</label> + <label>301</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> - <min_time_generation>0.145</min_time_generation> - <max_time_generation>0.145</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</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> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0.145</avg_time_generation> - </row> - <row> - <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> @@ -54,9 +33,10 @@ <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>50%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> @@ -78,27 +58,51 @@ </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <avg_time_generation>0</avg_time_generation> + <avg_time_generation>0.359</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -110,6 +114,65 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> + <label> Log Analytics - Analytics - Piwik</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.145</min_time_generation> + <max_time_generation>0.145</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.145</avg_time_generation> + </row> + <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 8845a80655..6ae99318f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -5,6 +5,9 @@ <nb_visits>5</nb_visits> <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>5</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -13,6 +16,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>category</label> @@ -171,6 +175,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -179,6 +186,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>manage-websites</label> @@ -273,6 +281,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -281,6 +292,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -375,6 +387,9 @@ <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -386,13 +401,245 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -404,6 +651,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> </row> <row> @@ -411,6 +659,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> @@ -420,6 +671,7 @@ <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> </row> <row> @@ -427,6 +679,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -438,6 +693,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> </row> <row> @@ -445,6 +701,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -456,6 +715,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> </row> <row> @@ -463,6 +723,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -471,6 +734,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>counter</label> @@ -513,6 +777,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -521,6 +788,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -547,6 +815,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -555,6 +826,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -581,6 +853,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -589,6 +864,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -611,10 +887,52 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <subtable> + <row> + <label>/theProduct</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <url>http://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -623,6 +941,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>is</label> @@ -777,6 +1096,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -785,6 +1107,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index b7cbdc125b..cce26eeec7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -647,6 +647,90 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -701,6 +785,150 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>log-analytics</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -1000,6 +1228,45 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <subtable> + <row> + <label>/theProduct</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <url>http://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index f1b90a5e1d..8789133564 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -1,17 +1,25 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <label>301</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>182</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> + <avg_time_on_page>90</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Topic/hw43061</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -26,23 +34,51 @@ </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -54,6 +90,72 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> + <label>307</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/temp-redirect</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> </row> </subtable> </row> @@ -62,6 +164,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -70,6 +175,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label> URL = http://piwik.net/to-an-error</label> @@ -95,6 +201,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -106,12 +215,16 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> <row> <label> Piwik Forums</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -123,5 +236,6 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index 867e27cd0d..401a36b835 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -22,6 +22,100 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> + <label>301</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>182</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Topic/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> + <label>404</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> + <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> <label> Log Analytics - Analytics - Piwik</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -43,66 +137,66 @@ <avg_time_generation>0.145</avg_time_generation> </row> <row> - <label>307</label> + <label>302</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <sum_time_spent>240</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> + <avg_time_on_page>240</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>0</avg_time_on_page> + <avg_time_on_page>240</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> </row> <row> - <label>404</label> + <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> + <label> URL = http://piwik.net/temp-redirect</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 28acca1242..f3ebc92964 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -5,6 +5,9 @@ <nb_visits>5</nb_visits> <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>5</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -13,6 +16,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>category</label> @@ -171,6 +175,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -179,6 +186,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>manage-websites</label> @@ -273,6 +281,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -281,6 +292,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -375,6 +387,9 @@ <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -386,13 +401,242 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -404,6 +648,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> </row> <row> @@ -411,6 +656,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -422,6 +670,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> </row> <row> @@ -429,12 +678,16 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> </row> <row> @@ -442,6 +695,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -453,6 +709,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> </row> <row> @@ -460,6 +717,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -468,6 +728,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>counter</label> @@ -510,6 +771,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -518,6 +782,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -544,6 +809,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -552,6 +820,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -578,6 +847,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -586,6 +858,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -612,6 +885,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -620,6 +896,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>is</label> @@ -770,10 +1047,42 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -782,6 +1091,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index 7721a10da1..63c3d594e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -647,6 +647,87 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -701,6 +782,150 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>log-analytics</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -1157,6 +1382,35 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 143229b5e7..7ecefada55 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,26 +2,35 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>20</nb_visits> - <nb_hits>20</nb_hits> + <nb_visits>23</nb_visits> + <nb_hits>23</nb_hits> <sum_time_spent>0</sum_time_spent> - <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> + <avg_time_generation>0.234</avg_time_generation> </row> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label> URL = http://piwik.net/moved-permanently</label> @@ -38,20 +47,8 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> - </subtable> - </row> - <row> - <label>307</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> - <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Topic/hw43061</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -66,23 +63,51 @@ </row> <row> <label>404</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> <subtable> <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -94,6 +119,72 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> + <label>302</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + </subtable> + </row> + <row> + <label>307</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/temp-redirect</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> </row> </subtable> </row> @@ -102,6 +193,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -110,6 +204,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label> URL = http://piwik.net/to-an-error</label> @@ -135,6 +230,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -146,12 +244,16 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> <row> <label> Piwik Forums</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -163,5 +265,6 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 509723308f..690c2e28a0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,17 +2,17 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>21</nb_visits> - <nb_hits>30</nb_hits> + <nb_visits>24</nb_visits> + <nb_hits>33</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>10</nb_hits_with_time_generation> + <nb_hits_with_time_generation>12</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.387</avg_time_generation> + <avg_time_generation>0.361</avg_time_generation> </row> <row> <label> Liberate Web Analytics - Analytics - Piwik</label> @@ -36,30 +36,9 @@ <avg_time_generation>0.177</avg_time_generation> </row> <row> - <label> Log Analytics - Analytics - Piwik</label> + <label>301</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> - <min_time_generation>0.145</min_time_generation> - <max_time_generation>0.145</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</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> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0.145</avg_time_generation> - </row> - <row> - <label>301</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> @@ -68,9 +47,10 @@ <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <avg_time_on_page>180</avg_time_on_page> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>90</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>50%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> @@ -88,69 +68,164 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> </row> + <row> + <label> URL = http://piwik.net/Topic/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> </subtable> </row> <row> - <label>307</label> + <label>404</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label> URL = http://piwik.net/hello/world/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + </row> + <row> + <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0</avg_time_generation> + </row> + </subtable> + </row> + <row> + <label> Log Analytics - Analytics - Piwik</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.145</min_time_generation> + <max_time_generation>0.145</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</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> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.145</avg_time_generation> + </row> + <row> + <label>302</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <sum_time_spent>240</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> - <avg_time_on_page>0</avg_time_on_page> + <avg_time_on_page>240</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/temp-redirect</label> + <label> URL = http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> - <sum_time_spent>0</sum_time_spent> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>0</avg_time_on_page> + <avg_time_on_page>240</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> </row> <row> - <label>404</label> + <label>307</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> <subtable> <row> - <label> URL = http://piwik.net/this/is/not/the/page/i/am/looking/for/</label> + <label> URL = http://piwik.net/temp-redirect</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> + <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> </row> </subtable> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index c3f7304c25..c7ae80a454 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -5,6 +5,9 @@ <nb_visits>5</nb_visits> <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>5</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -13,6 +16,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>category</label> @@ -171,6 +175,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -179,6 +186,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>manage-websites</label> @@ -273,6 +281,9 @@ <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>4</entry_nb_visits> <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -281,6 +292,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -375,6 +387,9 @@ <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -386,13 +401,258 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/</url> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>/index.htm</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -404,6 +664,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://example.org/index.htm</url> </row> <row> @@ -411,6 +672,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>2</entry_nb_actions> <entry_sum_visit_length>182</entry_sum_visit_length> @@ -420,6 +684,7 @@ <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/moved-permanently</url> </row> <row> @@ -427,6 +692,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -438,6 +706,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> </row> <row> @@ -445,12 +714,16 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/temp-redirect</url> </row> <row> @@ -458,6 +731,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -469,6 +745,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <url>http://piwik.net/to-an-error</url> </row> <row> @@ -476,6 +753,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -484,6 +764,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>counter</label> @@ -526,6 +807,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -534,6 +818,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -560,6 +845,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -568,6 +856,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -594,6 +883,9 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -602,6 +894,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> @@ -624,10 +917,52 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <subtable> + <row> + <label>/theProduct</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <url>http://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -636,6 +971,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>is</label> @@ -786,10 +1122,42 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> @@ -798,6 +1166,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> <subtable> <row> <label>/index</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index aaabfb8fc3..3434158d1f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -647,6 +647,103 @@ </subtable> </row> <row> + <label>Citrix</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>XenApp</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>Wan</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>auth</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>120</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>50%</exit_rate> + <subtable> + <row> + <label>/login.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>240</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>242</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>240</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + </row> + <row> + <label>/silentDetection.jsp</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>download</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -720,6 +817,150 @@ </subtable> </row> <row> + <label>hello</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>from</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>another</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + </subtable> + </row> + <row> + <label>world</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.359</avg_time_generation> + <subtable> + <row> + <label>/6,681965</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.359</min_time_generation> + <max_time_generation>0.359</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</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> + <avg_time_generation>0.359</avg_time_generation> + <url>http://piwik.net/hello/world/6,681965</url> + </row> + </subtable> + </row> + </subtable> + </row> + <row> <label>log-analytics</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -1065,6 +1306,45 @@ </subtable> </row> <row> + <label>Products</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <subtable> + <row> + <label>/theProduct</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.109</min_time_generation> + <max_time_generation>0.109</max_time_generation> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0.109</avg_time_generation> + <url>http://piwik.net/Products/theProduct</url> + </row> + </subtable> + </row> + <row> <label>this</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> @@ -1231,6 +1511,35 @@ </subtable> </row> <row> + <label>Topic</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <exit_nb_visits>1</exit_nb_visits> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <subtable> + <row> + <label>/hw43061</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <url>http://piwik.net/Topic/hw43061</url> + </row> + </subtable> + </row> + <row> <label>translations</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index c8388c1f4d..18b7f289f6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>26</nb_pageviews> - <nb_uniq_pageviews>26</nb_uniq_pageviews> + <nb_pageviews>32</nb_pageviews> + <nb_uniq_pageviews>32</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> + <avg_time_generation>0.277</avg_time_generation> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index a87ec05ee3..0fc359540d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>50</nb_pageviews> - <nb_uniq_pageviews>44</nb_uniq_pageviews> + <nb_pageviews>56</nb_pageviews> + <nb_uniq_pageviews>50</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> <nb_uniq_outlinks>1</nb_uniq_outlinks> <nb_searches>0</nb_searches> <nb_keywords>0</nb_keywords> - <avg_time_generation>0.301</avg_time_generation> + <avg_time_generation>0.298</avg_time_generation> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 6f8a9a4c98..491523012e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,28 +2,34 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>29</nb_actions> + <nb_actions>35</nb_actions> <subtable> <row> <label>200</label> - <nb_visits>23</nb_visits> - <nb_actions>25</nb_actions> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <nb_visits>26</nb_visits> + <nb_actions>28</nb_actions> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>307</label> + <label>404</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + </row> + <row> + <label>302</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> - <label>404</label> + <label>307</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 38d80d2b64..34fadbbd57 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</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> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>548</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> <row> @@ -24,4 +24,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> </row> + <row> + <label>Samsung</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index bb6679c971..147f52ac7c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -13,16 +13,27 @@ </row> <row> <label>Trident (IE)</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Blink (Chrome, Opera)</label> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> + </row> + <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index bc93ec3bb8..82fd2a7603 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> + <sum_visit_length>1</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</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> + <label>Internet Explorer</label> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Epiphany</label> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 39e7328e8c..90f330a5e5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -73,6 +73,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 37.0</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -109,6 +121,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome Mobile 39.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + </row> + <row> <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -120,4 +144,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> + <row> + <label>Internet Explorer 8.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index bc93ec3bb8..82fd2a7603 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> + <sum_visit_length>1</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</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> + <label>Internet Explorer</label> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Epiphany</label> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index b9bf650ebc..d0be913ad2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>28</nb_visits> + <nb_actions>32</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> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>548</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>26</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Vision</label> @@ -22,4 +22,15 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>GALAXY S5</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index af7e4f8f92..cfa8579474 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -13,39 +13,39 @@ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> + <label>Mac</label> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>306</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>Windows</label> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>10</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <nb_visits_converted>10</nb_visits_converted> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> - <label>Mac</label> - <nb_visits>6</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> - </row> - <row> <label>Android</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 254ec3889b..636ccfdeb7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -49,6 +49,18 @@ <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> + <label>Mac 10.10</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -61,6 +73,18 @@ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> <row> + <label>Android 4.4</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + </row> + <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -96,4 +120,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> + <row> + <label>Windows</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 0a059a62d6..e838256d3f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,39 +2,39 @@ <result> <row> <label>Desktop</label> - <nb_visits>23</nb_visits> - <nb_actions>26</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>21</bounce_count> - <nb_visits_converted>22</nb_visits_converted> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>548</sum_visit_length> + <bounce_count>23</bounce_count> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <label>Smartphone</label> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <label>Smartphone</label> + <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Tablet</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index 1ba1449d50..8c1697b221 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0 days</label> - <nb_conversions>24</nb_conversions> + <nb_conversions>28</nb_conversions> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index 0a94d5f36d..970c5a295d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_conversions>25</nb_conversions> + <nb_conversions>29</nb_conversions> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml index 4c6855264a..35d78ccc17 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>25</nb_conversions> - <nb_visits_converted>25</nb_visits_converted> - <revenue>125</revenue> - <conversion_rate>92.59%</conversion_rate> + <nb_conversions>29</nb_conversions> + <nb_visits_converted>29</nb_visits_converted> + <revenue>145</revenue> + <conversion_rate>93.55%</conversion_rate> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 5009922ea1..4f3dd0088e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1789,6 +1789,451 @@ </row> <row> <idSite>1</idSite> + <idVisit>45</idVisit> + <visitIp>172.20.1.0</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + <pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle> + <pageIdAction>62</pageIdAction> + + <pageId>62</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>302</customVariablePageValue1> + </row> + </customVariables> + <timeSpent>240</timeSpent> + <timeSpentPretty>4 min 0s</timeSpentPretty> + <icon /> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>62</goalPageId> + + <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</url> + <pageTitle /> + <pageIdAction>63</pageIdAction> + + <pageId>63</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>2</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>242</visitDuration> + <visitDurationPretty>4 min 2s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Windows</operatingSystem> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 8.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>8.0</browserVersion> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <latitude /> + <longitude /> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>11:55:13</visitLocalTime> + <visitLocalHour>11</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>44</idVisit> + <visitIp>173.5.0.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>61</goalPageId> + + <url>http://piwik.net/hello/from/another/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/hello/from/another/world/6,681965</url> + <pageTitle /> + <pageIdAction>60</pageIdAction> + + <pageId>61</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <generationTime>0.36s</generationTime> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId>user2</userId> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 37.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>37.0</browserVersion> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:30:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>42</idVisit> + <visitIp>70.95.0.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>58</goalPageId> + + <url>http://piwik.net/Products/theProduct</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Topic/hw43061</url> + <pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061</pageTitle> + <pageIdAction>57</pageIdAction> + + <pageId>59</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>301</customVariablePageValue1> + </row> + </customVariables> + <icon /> + </row> + <row> + <type>action</type> + <url>http://piwik.net/Products/theProduct</url> + <pageTitle /> + <pageIdAction>55</pageIdAction> + + <pageId>58</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <generationTime>0.11s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>2</actions> + <userId>user1</userId> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>2</visitDuration> + <visitDurationPretty>2s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Smartphone</deviceType> + <operatingSystem>Android</operatingSystem> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome Mobile 39.0</browser> + <browserName>Chrome Mobile</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserCode>CM</browserCode> + <browserVersion>39.0</browserVersion> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>43</idVisit> + <visitIp>173.5.0.0</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>60</goalPageId> + + <url>http://piwik.net/hello/world/6,681965</url> + <icon>plugins/Morpheus/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.net/hello/world/6,681965</url> + <pageTitle>404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965</pageTitle> + <pageIdAction>59</pageIdAction> + + <pageId>60</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>404</customVariablePageValue1> + </row> + </customVariables> + <generationTime>0.36s</generationTime> + <icon /> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <operatingSystem>Mac</operatingSystem> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <browserFamily>Blink</browserFamily> + <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> + <browser>Chrome 37.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>37.0</browserVersion> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>United States</location> + <latitude>38</latitude> + <longitude>-97</longitude> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + <visitLocalTime>17:00:00</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>0.0.0.0</visitIp> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index eb2209a224..d2edd33b60 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ <result> <row> <label>Piwik test</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> + <nb_pageviews>32</nb_pageviews> + <revenue>145</revenue> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index 1fb93e2a2a..79b56ff979 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> + <nb_pageviews>32</nb_pageviews> + <revenue>145</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml index 8cc6494492..f83cd0a71c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>Unknown</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>550</sum_visit_length> + <bounce_count>27</bounce_count> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url /> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index 80a6349ac1..9b5ba79691 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,22 +2,22 @@ <result> <row> <label>Direct Entry</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>34</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> + <sum_visit_length>550</sum_visit_length> + <bounce_count>25</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>23</nb_conversions> - <nb_visits_converted>23</nb_visits_converted> - <revenue>115</revenue> + <nb_conversions>27</nb_conversions> + <nb_visits_converted>27</nb_visits_converted> + <revenue>135</revenue> </row> </goals> - <nb_conversions>23</nb_conversions> - <revenue>115</revenue> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_conversions>27</nb_conversions> + <revenue>135</revenue> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>Websites</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index a14f0cec91..dc702824f1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,22 +2,22 @@ <result> <row> <label>Unknown</label> - <nb_visits>22</nb_visits> - <nb_actions>25</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>20</bounce_count> + <sum_visit_length>550</sum_visit_length> + <bounce_count>22</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>20</nb_conversions> - <nb_visits_converted>20</nb_visits_converted> - <revenue>100</revenue> + <nb_conversions>24</nb_conversions> + <nb_visits_converted>24</nb_visits_converted> + <revenue>120</revenue> </row> </goals> - <nb_conversions>20</nb_conversions> - <revenue>100</revenue> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_conversions>24</nb_conversions> + <revenue>120</revenue> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 23e244b751..212e81c785 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -21,44 +21,44 @@ <code>Asia</code> </row> <row> - <label>Unknown</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <label>North America</label> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <code>Unknown</code> + <sum_daily_nb_users>2</sum_daily_nb_users> + <code>North America</code> </row> <row> - <label>North America</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> + <label>Unknown</label> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>5</nb_conversions> - <revenue>25</revenue> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <code>North America</code> + <code>Unknown</code> </row> <row> <label>South America</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index ce5523efde..1c82333bf0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -24,48 +24,48 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Unknown</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <label>United States</label> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</sum_visit_length> <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>7</nb_conversions> - <nb_visits_converted>7</nb_visits_converted> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>7</nb_conversions> - <revenue>35</revenue> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <code>xx</code> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <sum_daily_nb_users>2</sum_daily_nb_users> + <code>us</code> + <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> - <label>United States</label> - <nb_visits>5</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>5</bounce_count> + <label>Unknown</label> + <nb_visits>8</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> + <nb_conversions>8</nb_conversions> + <nb_visits_converted>8</nb_visits_converted> + <revenue>40</revenue> </row> </goals> - <nb_conversions>5</nb_conversions> - <revenue>25</revenue> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <nb_conversions>8</nb_conversions> + <revenue>40</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <code>xx</code> + <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 4067fb2618..1149b705a7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,22 +2,22 @@ <result> <row> <label>Unknown</label> - <nb_visits>22</nb_visits> - <nb_actions>25</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>31</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>20</bounce_count> + <sum_visit_length>550</sum_visit_length> + <bounce_count>22</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>20</nb_conversions> - <nb_visits_converted>20</nb_visits_converted> - <revenue>100</revenue> + <nb_conversions>24</nb_conversions> + <nb_visits_converted>24</nb_visits_converted> + <revenue>120</revenue> </row> </goals> - <nb_conversions>20</nb_conversions> - <revenue>100</revenue> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_conversions>24</nb_conversions> + <revenue>120</revenue> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index bb6679c971..147f52ac7c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -13,16 +13,27 @@ </row> <row> <label>Trident (IE)</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Blink (Chrome, Opera)</label> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> + </row> + <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 39e7328e8c..90f330a5e5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -73,6 +73,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome 37.0</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -109,6 +121,18 @@ <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> + <label>Chrome Mobile 39.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + </row> + <row> <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -120,4 +144,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> + <row> + <label>Internet Explorer 8.0</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index bc93ec3bb8..82fd2a7603 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Internet Explorer</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <label>Chrome</label> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> + <sum_visit_length>1</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>5</nb_visits> - <nb_actions>5</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> + <label>Internet Explorer</label> + <nb_visits>7</nb_visits> + <nb_actions>8</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Epiphany</label> @@ -84,4 +84,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> + <row> + <label>Chrome Mobile</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 446d719865..75d278b51b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -34,6 +34,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Mac / Chrome / unknown</label> + <nb_visits>3</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>3</bounce_count> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + </row> + <row> <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -67,18 +78,18 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Bot / Unknown / unknown</label> + <label>Android / Chrome Mobile / unknown</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_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> - <label>GNU/Linux / Chrome / unknown</label> + <label>Bot / Unknown / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -89,7 +100,7 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> - <label>Mac / Chrome / unknown</label> + <label>GNU/Linux / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -111,6 +122,17 @@ <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> + <label>Windows / Internet Explorer / unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Windows XP / Chrome / 1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml index fc37ec8a8f..8d4b8d074e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown (xx)</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>550</sum_visit_length> + <bounce_count>27</bounce_count> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index 1f8c578db7..3ed6ff7309 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>25</bounce_count> - <nb_visits_converted>25</nb_visits_converted> - <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>550</sum_visit_length> + <bounce_count>27</bounce_count> + <nb_visits_converted>29</nb_visits_converted> + <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 0a059a62d6..e838256d3f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,39 +2,39 @@ <result> <row> <label>Desktop</label> - <nb_visits>23</nb_visits> - <nb_actions>26</nb_actions> + <nb_visits>26</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>21</bounce_count> - <nb_visits_converted>22</nb_visits_converted> - <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>548</sum_visit_length> + <bounce_count>23</bounce_count> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <label>Smartphone</label> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> <row> - <label>Smartphone</label> + <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Tablet</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index af7e4f8f92..cfa8579474 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -13,39 +13,39 @@ <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> </row> <row> + <label>Mac</label> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>306</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>Windows</label> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>10</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <nb_visits_converted>10</nb_visits_converted> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/WI7.gif</logo> </row> <row> - <label>Mac</label> - <nb_visits>6</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>5</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> - </row> - <row> <label>Android</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>3</nb_visits> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits_converted>3</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 254ec3889b..636ccfdeb7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -49,6 +49,18 @@ <logo>plugins/DevicesDetection/images/os/AND.gif</logo> </row> <row> + <label>Mac 10.10</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + </row> + <row> <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -61,6 +73,18 @@ <logo>plugins/DevicesDetection/images/os/WXP.gif</logo> </row> <row> + <label>Android 4.4</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + </row> + <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -96,4 +120,16 @@ <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> </row> + <row> + <label>Windows</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index d1f2bda02f..a96d5feb81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,43 +3,43 @@ <row> <label>Cookie</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>8%</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%</nb_visits_percentage> + <nb_visits_percentage>8%</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%</nb_visits_percentage> + <nb_visits_percentage>8%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</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%</nb_visits_percentage> + <nb_visits_percentage>4%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml index 659d5beea1..378996fabc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -2,14 +2,14 @@ <result> <row> <label>unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> + <nb_visits>29</nb_visits> + <nb_actions>34</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> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_visit_length>550</sum_visit_length> + <bounce_count>25</bounce_count> + <nb_visits_converted>27</nb_visits_converted> + <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>1024x768</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml index 3633fe5914..02a0dc7272 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> - <nb_users_returning>0</nb_users_returning> - <nb_visits_returning>1</nb_visits_returning> - <nb_actions_returning>1</nb_actions_returning> - <nb_visits_converted_returning>1</nb_visits_converted_returning> - <bounce_count_returning>1</bounce_count_returning> - <sum_visit_length_returning>0</sum_visit_length_returning> + <nb_uniq_visitors_returning>2</nb_uniq_visitors_returning> + <nb_users_returning>1</nb_users_returning> + <nb_visits_returning>2</nb_visits_returning> + <nb_actions_returning>2</nb_actions_returning> + <nb_visits_converted_returning>2</nb_visits_converted_returning> + <bounce_count_returning>2</bounce_count_returning> + <sum_visit_length_returning>1</sum_visit_length_returning> <max_actions_returning>1</max_actions_returning> <bounce_rate_returning>100%</bounce_rate_returning> <nb_actions_per_visit_returning>1</nb_actions_per_visit_returning> - <avg_time_on_site_returning>0</avg_time_on_site_returning> + <avg_time_on_site_returning>1</avg_time_on_site_returning> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml index f301254690..c42125d072 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits_returning>10</nb_visits_returning> - <nb_actions_returning>12</nb_actions_returning> - <nb_visits_converted_returning>9</nb_visits_converted_returning> - <bounce_count_returning>8</bounce_count_returning> - <sum_visit_length_returning>115</sum_visit_length_returning> + <nb_visits_returning>11</nb_visits_returning> + <nb_actions_returning>13</nb_actions_returning> + <nb_visits_converted_returning>10</nb_visits_converted_returning> + <bounce_count_returning>9</bounce_count_returning> + <sum_visit_length_returning>116</sum_visit_length_returning> <max_actions_returning>2</max_actions_returning> - <bounce_rate_returning>80%</bounce_rate_returning> + <bounce_rate_returning>82%</bounce_rate_returning> <nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning> - <avg_time_on_site_returning>12</avg_time_on_site_returning> + <avg_time_on_site_returning>11</avg_time_on_site_returning> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index 1a729a8e26..4de7a18047 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -12,24 +12,24 @@ </row> <row> <label>Wednesday</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits>5</nb_visits> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_actions>6</nb_actions> + <nb_users>2</nb_users> + <sum_visit_length>3</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> <day_of_week>3</day_of_week> </row> <row> <label>Thursday</label> - <nb_visits>9</nb_visits> - <nb_uniq_visitors>9</nb_uniq_visitors> - <nb_actions>9</nb_actions> + <nb_visits>10</nb_visits> + <nb_uniq_visitors>10</nb_uniq_visitors> + <nb_actions>11</nb_actions> <nb_users>0</nb_users> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>242</sum_visit_length> <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> + <nb_visits_converted>10</nb_visits_converted> <day_of_week>4</day_of_week> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 427319a89f..dc841363a5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -123,13 +123,13 @@ </row> <row> <label>11h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -189,14 +189,14 @@ </row> <row> <label>17h</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</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> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>18h</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 515e54eb3b..144d6c4221 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -150,14 +150,23 @@ </row> <row> <label>11h</label> - <nb_visits>0</nb_visits> - <nb_actions>0</nb_actions> - <max_actions>0</max_actions> - <sum_visit_length>0</sum_visit_length> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <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> </row> <row> <label>12h</label> @@ -243,23 +252,23 @@ </row> <row> <label>17h</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> + <nb_visits>6</nb_visits> + <nb_actions>7</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>3</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <goals> <row idgoal='1'> - <nb_conversions>2</nb_conversions> - <nb_visits_converted>2</nb_visits_converted> - <revenue>10</revenue> + <nb_conversions>5</nb_conversions> + <nb_visits_converted>5</nb_visits_converted> + <revenue>25</revenue> </row> </goals> - <nb_conversions>2</nb_conversions> - <revenue>10</revenue> + <nb_conversions>5</nb_conversions> + <revenue>25</revenue> </row> <row> <label>18h</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index c47de22fc4..005a1842ab 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,11 +2,11 @@ <result> <row> <label>New visits</label> - <nb_visits>26</nb_visits> + <nb_visits>29</nb_visits> </row> <row> <label>0 days</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index c7ed81d100..a66c195749 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,11 +2,11 @@ <result> <row> <label>New visits</label> - <nb_visits>30</nb_visits> + <nb_visits>33</nb_visits> </row> <row> <label>0 days</label> - <nb_visits>3</nb_visits> + <nb_visits>4</nb_visits> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index 0830ca0d10..dcd45b3a61 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>27</nb_visits> + <nb_visits>31</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index d7672ae30c..768a0961d2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,8 +2,8 @@ <result> <row> <label>1 visit</label> - <nb_visits>33</nb_visits> - <nb_visits_percentage>83%</nb_visits_percentage> + <nb_visits>37</nb_visits> + <nb_visits_percentage>84%</nb_visits_percentage> </row> <row> <label>2 visits</label> @@ -18,7 +18,7 @@ <row> <label>4 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>5 visits</label> @@ -33,7 +33,7 @@ <row> <label>7 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>8 visits</label> @@ -58,7 +58,7 @@ <row> <label>51-100 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2%</nb_visits_percentage> </row> <row> <label>101-200 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 4e6a9ab29e..c00b8e2c50 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,11 +2,11 @@ <result> <row> <label>1 page</label> - <nb_visits>25</nb_visits> + <nb_visits>27</nb_visits> </row> <row> <label>2 pages</label> - <nb_visits>1</nb_visits> + <nb_visits>3</nb_visits> </row> <row> <label>3 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml index 11e27426c0..95adfb7f9a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,11 +2,11 @@ <result> <row> <label>1 page</label> - <nb_visits>34</nb_visits> + <nb_visits>36</nb_visits> </row> <row> <label>2 pages</label> - <nb_visits>3</nb_visits> + <nb_visits>5</nb_visits> </row> <row> <label>3 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index a64c14a967..1f6410e079 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>25</nb_visits> + <nb_visits>28</nb_visits> </row> <row> <label>11-30s</label> @@ -22,7 +22,7 @@ </row> <row> <label>4-7 min</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>7-10 min</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index a0cba6d294..c53cacde6f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>35</nb_visits> + <nb_visits>38</nb_visits> </row> <row> <label>11-30s</label> @@ -22,7 +22,7 @@ </row> <row> <label>4-7 min</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>7-10 min</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 3fb9469667..8af80c337f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>30</result>
\ No newline at end of file +<result>36</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index 4c77f1f6e6..40bd2e592a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>25</result>
\ No newline at end of file +<result>27</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 0a9c671f55..e686bbc101 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>5 min 5s</result>
\ No newline at end of file +<result>9 min 10s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index df25f1c1f3..9674a59b3a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>305</result>
\ No newline at end of file +<result>550</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 40bd2e592a..3fb9469667 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27</result>
\ No newline at end of file +<result>30</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml index f5722c2b94..13002b2017 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>0</result>
\ No newline at end of file +<result>2</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 4c77f1f6e6..46af1425a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>25</result>
\ No newline at end of file +<result>29</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 40bd2e592a..51c650b8b2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27</result>
\ No newline at end of file +<result>31</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index 327d564f47..1772684d5e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>27</nb_uniq_visitors> - <nb_users>0</nb_users> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_visits_converted>25</nb_visits_converted> - <bounce_count>25</bounce_count> - <sum_visit_length>305</sum_visit_length> + <nb_uniq_visitors>30</nb_uniq_visitors> + <nb_users>2</nb_users> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> + <nb_visits_converted>29</nb_visits_converted> + <bounce_count>27</bounce_count> + <sum_visit_length>550</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>93%</bounce_rate> - <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>11</avg_time_on_site> + <bounce_rate>87%</bounce_rate> + <nb_actions_per_visit>1.2</nb_actions_per_visit> + <avg_time_on_site>18</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 0fb183d46f..bce2027e1c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,11 +3,11 @@ <result date="2012-08"> <row> <label>Piwik test</label> - <nb_visits>27</nb_visits> - <nb_actions>30</nb_actions> - <nb_pageviews>26</nb_pageviews> - <revenue>125</revenue> - <nb_conversions>25</nb_conversions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> + <nb_pageviews>32</nb_pageviews> + <revenue>145</revenue> + <nb_conversions>29</nb_conversions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -42,11 +42,11 @@ <nb_pageviews>10</nb_pageviews> <revenue>5</revenue> <nb_conversions>1</nb_conversions> - <visits_evolution>-96.3%</visits_evolution> - <actions_evolution>-66.7%</actions_evolution> - <pageviews_evolution>-61.5%</pageviews_evolution> - <revenue_evolution>-96%</revenue_evolution> - <nb_conversions_evolution>-96%</nb_conversions_evolution> + <visits_evolution>-96.8%</visits_evolution> + <actions_evolution>-72.2%</actions_evolution> + <pageviews_evolution>-68.8%</pageviews_evolution> + <revenue_evolution>-96.6%</revenue_evolution> + <nb_conversions_evolution>-96.6%</nb_conversions_evolution> <group /> <main_url>http://piwik.net</main_url> <idsite>1</idsite> diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log new file mode 100644 index 0000000000..d7ff476a6c --- /dev/null +++ b/tests/resources/access-logs/fake_logs_custom_iis.log @@ -0,0 +1,8 @@ +#Software: IIS Advanced Logging Module +#Version: 1.0 +#Start-Date: 2014-11-18 00:00:00.128 +#Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS +2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 user1 "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109 +2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 user1 "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0 +2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359 +2012-08-15 17:30:00.675 10.10.28.140 GET /hello/from/another/world/6,681965 - 80 user2 "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 200 0 0 359 diff --git a/tests/resources/access-logs/fake_logs_netscaler.log b/tests/resources/access-logs/fake_logs_netscaler.log new file mode 100644 index 0000000000..17035db670 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_netscaler.log @@ -0,0 +1,6 @@ +#Version: 1.0 +#Software: Netscaler Web Logging(NSWL) +#Date: 2014-02-18 11:55:13 +#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - +2012-08-16 11:59:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/silentDetection.jsp - 200 310 5609 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) JSESSIONID=7BBF2F11B80261B27D23010421412323 -
\ No newline at end of file |