diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-03-13 03:13:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 03:13:57 +0300 |
| commit | def74364a2d821d5dddaceece76c217547b99d14 (patch) | |
| tree | cb6966a9ffec1a1b4c946d82ca0f91ec53c29b18 | |
| parent | e26f5e7a359e990b4c4d726de85839e8923619ab (diff) | |
Couple assorted changes (#13935)
* Allow annotations API to accept multiple periods, so evolution graphs that use multiple periods work.
* Remove warning when rows_to_display viewdatatable config property is left at its default value.
* Allow individual cells in an html visualization to be styled (if the visualization is extended).
* Remove unneeded TODO.
* In series picker encode picked rows in case the labels have commas.
* Must decode the rows value as well (as it is not handled by API, must be done in plugin).
* Allow joins to specified through LogAggregator::queryConversionsByDimension().
* Add safety check to _idts processing: if visitor is unknown, ignore _idts value, since it is their first visit.
* In the tracker when searching by visitor ID, search through entire log_visit table instead of just in the last 30 mins.
* When tracking visitor days since first, do not round since this can result in inaccurate data when rounding up. Which can cause trouble when finding the start visit for a log.
* Allow HtmlTable descendants to add any html attributes to cells.
* Allow derived Visualizations to add custom parameters to API requests via a new RequestConfig method.
* Tweak to TODO.
* Add test for annotations API change & get to pass.
* Apply more review feedback
* Update INI config docs for window_look_back_for_visitor.
* Only copy visitor properties if action is part of an existing visit.
* Some more properties that should be copied over from known visitor even if new visit.
* Fixing some tests.
* update test
* Fix CustomEventsTest test failures.
* Fixing more tests.
* update rest of tests
* Fixing tests.
* Update some test files.
* Fix log statements.
* To better handle out of order actions, add part of last_action_time check to visitor ID search.
* Update tests.
* Updating expected screenshots.
* Fix ArchiveCronTest.
* Throw exception if idorder not unique.
* Only throw exception if idorder specified.
* Fixing a couple tests.
* Fix another test.
240 files changed, 3859 insertions, 727 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index da7aa87544..11bc936dd8 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -744,10 +744,12 @@ record_statistics = 1 ; `_paq.push(['setSessionCookieTimeout', timeoutInSeconds=1800])` visit_standard_length = 1800 -; The window to look back for a previous visit by this current visitor. Defaults to visit_standard_length. +; The amount of time in the past to match the current visitor to a known visitor via fingerprint. Defaults to visit_standard_length. ; If you are looking for higher accuracy of "returning visitors" metrics, you may set this value to 86400 or more. ; This is especially useful when you use the Tracking API where tracking Returning Visitors often depends on this setting. -; The value window_look_back_for_visitor is used only if it is set to greater than visit_standard_length +; The value window_look_back_for_visitor is used only if it is set to greater than visit_standard_length. +; Note: visitors with visitor IDs will be matched by visitor ID from any point in time, this is only for recognizing visitors +; by device fingerprint. window_look_back_for_visitor = 0 ; visitors that stay on the website and view only one page will be considered as time on site of 0 second diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index 1801fa207e..0257d60e93 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -805,7 +805,7 @@ class LogAggregator * clause. These can be aggregate expressions, eg, `SUM(somecol)`. * @return \Zend_Db_Statement */ - public function queryConversionsByDimension($dimensions = array(), $where = false, $additionalSelects = array()) + public function queryConversionsByDimension($dimensions = array(), $where = false, $additionalSelects = array(), $extraFrom = []) { $dimensions = array_merge(array(self::IDGOAL_FIELD), $dimensions); $tableName = self::LOG_CONVERSION_TABLE; @@ -813,7 +813,7 @@ class LogAggregator $select = $this->getSelectStatement($dimensions, $tableName, $additionalSelects, $availableMetrics); - $from = array($tableName); + $from = array_merge([$tableName], $extraFrom); $where = $this->getWhereStatement($tableName, self::CONVERSION_DATETIME_FIELD, $where); $groupBy = $this->getGroupByStatement($dimensions, $tableName); $orderBy = false; diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 42ea884cac..0b5cca0786 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -12,6 +12,7 @@ use Exception; use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\Date; +use Piwik\Exception\InvalidRequestParameterException; use Piwik\Piwik; use Piwik\Plugin\Dimension\ConversionDimension; use Piwik\Plugin\Dimension\VisitDimension; @@ -741,7 +742,15 @@ class GoalManager $newGoalDebug['idvisitor'] = bin2hex($newGoalDebug['idvisitor']); Common::printDebug($newGoalDebug); + $idorder = $request->getParam('ec_id'); + $wasInserted = $this->getModel()->createConversion($conversion); + if (!$wasInserted + && !empty($idorder) + ) { + $idSite = $request->getIdSite(); + throw new InvalidRequestParameterException("Invalid non-unique idsite/idorder combination ($idSite, $idorder), conversion was not inserted."); + } return $wasInserted; } diff --git a/core/Tracker/Model.php b/core/Tracker/Model.php index 82aae3e46d..16fc04fd92 100644 --- a/core/Tracker/Model.php +++ b/core/Tracker/Model.php @@ -357,23 +357,26 @@ class Model // this page view to the wrong visitor, but this is better than creating artificial visits. // 2) there is a visitor ID and we trust it (config setting trust_visitors_cookies, OR it was set using &cid= in tracking API), // and in these cases, we force to look up this visitor id - $whereCommon = "visit_last_action_time >= ? AND visit_last_action_time <= ? AND idsite = ?"; - $bindSql = array( + $configIdWhere = "visit_last_action_time >= ? AND visit_last_action_time <= ? AND idsite = ?"; + $configIdbindSql = array( $timeLookBack, $timeLookAhead, $idSite ); + $visitorIdWhere = 'idsite = ? AND visit_last_action_time <= ?'; + $visitorIdbindSql = [$idSite, $timeLookAhead]; + if ($shouldMatchOneFieldOnly && $isVisitorIdToLookup) { - $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql); } elseif ($shouldMatchOneFieldOnly) { - $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql); } else { - $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql); if (empty($visitRow)) { - $whereCommon .= ' AND user_id IS NULL '; - $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $whereCommon, $bindSql); + $configIdWhere .= ' AND user_id IS NULL '; + $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql); } } diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 9d3709e05a..5211d834f3 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -237,7 +237,7 @@ class Request $cookieFirstVisitTimestamp = $this->getCurrentTimestamp(); } - $daysSinceFirstVisit = round(($this->getCurrentTimestamp() - $cookieFirstVisitTimestamp) / 86400, $precision = 0); + $daysSinceFirstVisit = floor(($this->getCurrentTimestamp() - $cookieFirstVisitTimestamp) / 86400); if ($daysSinceFirstVisit < 0) { $daysSinceFirstVisit = 0; diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index 4b3be310a2..7e6db6b9b9 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -65,6 +65,11 @@ class VisitorRecognizer */ private $eventDispatcher; + /** + * @var array + */ + private $visitRow; + public function __construct($trustCookiesOnly, $visitStandardLength, $lookbackNSecondsCustom, $trackerAlwaysNewVisitor, Model $model, EventDispatcher $eventDispatcher) { @@ -96,12 +101,13 @@ class VisitorRecognizer Common::printDebug("Visitor doesn't have the piwik cookie..."); } - $persistedVisitAttributes = $this->getVisitFieldsPersist(); + $persistedVisitAttributes = $this->getVisitorFieldsPersist(); $shouldMatchOneFieldOnly = $this->shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, $request); list($timeLookBack, $timeLookAhead) = $this->getWindowLookupThisVisit($request); $visitRow = $this->model->findVisitor($idSite, $configId, $idVisitor, $persistedVisitAttributes, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead); + $this->visitRow = $visitRow; $isNewVisitForced = $request->getParam('new_visit'); $isNewVisitForced = !empty($isNewVisitForced); @@ -117,37 +123,15 @@ class VisitorRecognizer && $visitRow && count($visitRow) > 0 ) { - - // These values will be used throughout the request - foreach ($persistedVisitAttributes as $field) { - $visitProperties->setProperty($field, $visitRow[$field]); - } - $visitProperties->setProperty('visit_last_action_time', strtotime($visitRow['visit_last_action_time'])); $visitProperties->setProperty('visit_first_action_time', strtotime($visitRow['visit_first_action_time'])); - - // Custom Variables copied from Visit in potential later conversion - if (!empty($numCustomVarsToRead)) { - for ($i = 1; $i <= $numCustomVarsToRead; $i++) { - if (isset($visitRow['custom_var_k' . $i]) - && strlen($visitRow['custom_var_k' . $i]) - ) { - $visitProperties->setProperty('custom_var_k' . $i, $visitRow['custom_var_k' . $i]); - } - if (isset($visitRow['custom_var_v' . $i]) - && strlen($visitRow['custom_var_v' . $i]) - ) { - $visitProperties->setProperty('custom_var_v' . $i, $visitRow['custom_var_v' . $i]); - } - } - } + $visitProperties->setProperty('idvisitor', $visitRow['idvisitor']); + $visitProperties->setProperty('user_id', $visitRow['user_id']); Common::printDebug("The visitor is known (idvisitor = " . bin2hex($visitProperties->getProperty('idvisitor')) . ", config_id = " . bin2hex($configId) . ", - idvisit = {$visitProperties->getProperty('idvisit')}, last action = " . date("r", $visitProperties->getProperty('visit_last_action_time')) . ", - first action = " . date("r", $visitProperties->getProperty('visit_first_action_time')) . ", - visit_goal_buyer' = " . $visitProperties->getProperty('visit_goal_buyer') . ")"); + first action = " . date("r", $visitProperties->getProperty('visit_first_action_time')) . ")"); return true; } else { @@ -157,6 +141,22 @@ class VisitorRecognizer } } + public function updateVisitPropertiesFromLastVisitRow(VisitProperties $visitProperties) + { + // These values will be used throughout the request + foreach ($this->getVisitorFieldsPersist() as $field) { + if ($field == 'visit_last_action_time' || $field == 'visit_first_action_time') { + continue; + } + + $visitProperties->setProperty($field, $this->visitRow[$field]); + } + + Common::printDebug("The visit is part of an existing visit ( + idvisit = {$visitProperties->getProperty('idvisit')}, + visit_goal_buyer' = " . $visitProperties->getProperty('visit_goal_buyer') . ")"); + } + protected function shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, Request $request) { $isForcedUserIdMustMatch = (false !== $request->getForcedUserId()); @@ -212,7 +212,7 @@ class VisitorRecognizer /** * @return array */ - private function getVisitFieldsPersist() + private function getVisitorFieldsPersist() { if (is_null($this->visitFieldsToSelect)) { $fields = array( diff --git a/core/ViewDataTable/Request.php b/core/ViewDataTable/Request.php index b25c01f245..a870d70c67 100644 --- a/core/ViewDataTable/Request.php +++ b/core/ViewDataTable/Request.php @@ -60,7 +60,7 @@ class Request 'format' => 'original' ); - $toSetEventually = array( + $toSetEventually = array_merge(array( 'filter_limit', 'keep_totals_row', 'keep_summary_row', @@ -76,7 +76,7 @@ class Request 'pivotBy', 'pivotByColumn', 'pivotByColumnLimit' - ); + ), $this->requestConfig->getExtraParametersToSet()); foreach ($toSetEventually as $varToSet) { $value = $this->getDefaultOrCurrent($varToSet); diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php index ecdaa794ab..937624a358 100644 --- a/core/ViewDataTable/RequestConfig.php +++ b/core/ViewDataTable/RequestConfig.php @@ -345,4 +345,15 @@ class RequestConfig return $method; } + + /** + * Override this method if you want to add custom request parameters to the API request based on ViewDataTable + * parameters. Return in the result the list of extra parameters. + * + * @return array eg, `['mycustomparam']` + */ + public function getExtraParametersToSet() + { + return []; + } } diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 4417677fe2..c5ba5f3ce7 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -436,7 +436,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -798,10 +798,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -1184,7 +1184,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1546,10 +1546,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -1932,7 +1932,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -2497,10 +2497,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -2648,10 +2648,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -3261,7 +3261,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -3412,7 +3412,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -4399,10 +4399,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -4550,10 +4550,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -4701,10 +4701,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -4852,10 +4852,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml index e7e79a4222..28a968d919 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>55</nb_actions> <nb_visits_converted>20</nb_visits_converted> <bounce_count>10</bounce_count> - <sum_visit_length>16210</sum_visit_length> + <sum_visit_length>16215</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml index c0631c362b..4269cea13d 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>12</nb_actions> <nb_visits_converted>5</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>3242</sum_visit_length> + <sum_visit_length>3243</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>60%</bounce_rate> <nb_actions_per_visit>2.4</nb_actions_per_visit> - <avg_time_on_site>648</avg_time_on_site> + <avg_time_on_site>649</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml index 780ddda63a..bcea1c4ec4 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>50</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>9</bounce_count> - <sum_visit_length>14589</sum_visit_length> + <sum_visit_length>14593</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml index 02d91d0e9c..b5a939a130 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>28</nb_actions> <nb_visits_converted>10</nb_visits_converted> <bounce_count>5</bounce_count> - <sum_visit_length>8105</sum_visit_length> + <sum_visit_length>8107</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml index c8839b7ab5..1dc5b7681d 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>56</nb_actions> <nb_visits_converted>20</nb_visits_converted> <bounce_count>10</bounce_count> - <sum_visit_length>16210</sum_visit_length> + <sum_visit_length>16214</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml index 02d91d0e9c..b5a939a130 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>28</nb_actions> <nb_visits_converted>10</nb_visits_converted> <bounce_count>5</bounce_count> - <sum_visit_length>8105</sum_visit_length> + <sum_visit_length>8107</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml index 275f332d1e..c8fba4a59b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>76</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21081</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>57%</bounce_rate> <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>702</avg_time_on_site> + <avg_time_on_site>703</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml index 275f332d1e..c8fba4a59b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>76</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21081</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>57%</bounce_rate> <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>702</avg_time_on_site> + <avg_time_on_site>703</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml index 275f332d1e..c8fba4a59b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>76</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21081</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>57%</bounce_rate> <nb_actions_per_visit>2.5</nb_actions_per_visit> - <avg_time_on_site>702</avg_time_on_site> + <avg_time_on_site>703</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml index 90545e08bf..27933cf67d 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>100</row> - <row>101</row> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml index eb20b7dcf9..3c23ae5e4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>17</nb_visits> - <nb_actions>77</nb_actions> - <nb_visits_converted>17</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <nb_visits>25</nb_visits> + <nb_actions>85</nb_actions> + <nb_visits_converted>25</nb_visits_converted> + <bounce_count>8</bounce_count> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>4.5</nb_actions_per_visit> - <avg_time_on_site>1621</avg_time_on_site> + <bounce_rate>32%</bounce_rate> + <nb_actions_per_visit>3.4</nb_actions_per_visit> + <avg_time_on_site>1103</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml index 602805c283..6e71b7139a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>73</nb_actions> <nb_visits_converted>27</nb_visits_converted> <bounce_count>14</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21079</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>52%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>780</avg_time_on_site> + <avg_time_on_site>781</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml index 602805c283..6e71b7139a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>73</nb_actions> <nb_visits_converted>27</nb_visits_converted> <bounce_count>14</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21079</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>52%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>780</avg_time_on_site> + <avg_time_on_site>781</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml index 7c9bf3fd36..9140fa1a46 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>50</nb_actions> <nb_visits_converted>26</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>12968</sum_visit_length> + <sum_visit_length>12976</sum_visit_length> <max_actions>4</max_actions> <bounce_rate>69%</bounce_rate> <nb_actions_per_visit>1.9</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml index 3ce6d98183..6202c38a2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>74</nb_actions> <nb_visits_converted>28</nb_visits_converted> <bounce_count>15</bounce_count> - <sum_visit_length>21073</sum_visit_length> + <sum_visit_length>21079</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>54%</bounce_rate> <nb_actions_per_visit>2.6</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml index 789c2c6fd1..1583658083 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>16</nb_actions> <nb_visits_converted>6</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml index 789c2c6fd1..1583658083 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>16</nb_actions> <nb_visits_converted>6</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml index a2651f3ccd..ef5b0960c0 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>68</nb_actions> <nb_visits_converted>25</nb_visits_converted> <bounce_count>13</bounce_count> - <sum_visit_length>19452</sum_visit_length> + <sum_visit_length>19457</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>52%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml index abb563f023..eaface92a5 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>51</nb_actions> <nb_visits_converted>19</nb_visits_converted> <bounce_count>10</bounce_count> - <sum_visit_length>14589</sum_visit_length> + <sum_visit_length>14593</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>53%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml index b72146a986..339a0f2a62 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>17</nb_actions> <nb_visits_converted>17</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml index d21dc7e9e9..e0791e085c 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>94</nb_actions> <nb_visits_converted>34</nb_visits_converted> <bounce_count>17</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml index 789c2c6fd1..1583658083 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>16</nb_actions> <nb_visits_converted>6</nb_visits_converted> <bounce_count>3</bounce_count> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml index 1d724e8969..98f8df195a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>90</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>13</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>43%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml index 1d39a66637..095e2caff1 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>1621</row> + <row>1</row> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml index 83f3ba2d8c..a5d671efdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>83</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>15</bounce_count> - <sum_visit_length>24315</sum_visit_length> + <sum_visit_length>24322</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>2.8</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml index f3bee672d6..c52a442d2f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ <nb_actions>95</nb_actions> <nb_visits_converted>35</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>51%</bounce_rate> <nb_actions_per_visit>2.7</nb_actions_per_visit> - <avg_time_on_site>787</avg_time_on_site> + <avg_time_on_site>788</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml index 7ace3fcbe7..9857cf3bdd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>18</nb_actions> <nb_visits_converted>18</nb_visits_converted> <bounce_count>18</bounce_count> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>8</sum_visit_length> <max_actions>1</max_actions> <bounce_rate>100%</bounce_rate> <nb_actions_per_visit>1</nb_actions_per_visit> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml index 8f2deb63ee..6d1659382f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml @@ -1,21 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>08f90c1a41715536</row> - <row>1587965fb4d4b5af</row> <row>1bd69c7df3112fb9</row> - <row>2387337ba1e0b024</row> <row>908c9a564a864265</row> - <row>9246444d94f081e3</row> - <row>a4380923dd651c19</row> <row>a9b7ba70783b617e</row> <row>aa68c75c4a77c87f</row> <row>b8c37e33defde51c</row> - <row>d0fb963ff976f9c3</row> - <row>d7322ed717dedf1e</row> - <row>d806ca13ca3449af</row> <row>e93028bdc1aacdfb</row> <row>fba9d88164f3e2d9</row> <row>fed33392d3a48aa1</row> - <row>ffc58105bf6f8a91</row> <row>e64bc481700c5d69</row> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml index 0e04d3f6d9..f0c215da1a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>2</nb_visits> - <nb_actions>6</nb_actions> - <nb_visits_converted>2</nb_visits_converted> - <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <nb_visits>4</nb_visits> + <nb_actions>11</nb_actions> + <nb_visits_converted>4</nb_visits_converted> + <bounce_count>2</bounce_count> + <sum_visit_length>3243</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>50%</bounce_rate> - <nb_actions_per_visit>3</nb_actions_per_visit> + <nb_actions_per_visit>2.8</nb_actions_per_visit> <avg_time_on_site>811</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml index 1d724e8969..98f8df195a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ <nb_actions>90</nb_actions> <nb_visits_converted>30</nb_visits_converted> <bounce_count>13</bounce_count> - <sum_visit_length>27557</sum_visit_length> + <sum_visit_length>27565</sum_visit_length> <max_actions>5</max_actions> <bounce_rate>43%</bounce_rate> <nb_actions_per_visit>3</nb_actions_per_visit> diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index 136b4ececd..9889ff7349 100644 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -320,21 +320,21 @@ class API extends \Piwik\Plugin\API return array(false, false); } - // if the range is just a normal period (or the period is a range in which case lastN is ignored) - if ($lastN === false - || $period == 'range' - ) { - if ($period == 'range') { - $oPeriod = new Range('day', $date); - } else { - $oPeriod = Period\Factory::build($period, Date::factory($date)); - } + $isMultiplePeriod = Range::isMultiplePeriod($date, $period); + // if the range is just a normal period (or the period is a range in which case lastN is ignored) + if ($period == 'range') { + $oPeriod = new Range('day', $date); + $startDate = $oPeriod->getDateStart(); + $endDate = $oPeriod->getDateEnd(); + } else if ($lastN == false && !$isMultiplePeriod) { + $oPeriod = Period\Factory::build($period, Date::factory($date)); $startDate = $oPeriod->getDateStart(); $endDate = $oPeriod->getDateEnd(); - } else // if the range includes the last N periods - { - list($date, $lastN) = EvolutionViz::getDateRangeAndLastN($period, $date, $lastN); + } else { // if the range includes the last N periods or is a multiple period + if (!$isMultiplePeriod) { + list($date, $lastN) = EvolutionViz::getDateRangeAndLastN($period, $date, $lastN); + } list($startDate, $endDate) = explode(',', $date); $startDate = Date::factory($startDate); diff --git a/plugins/Annotations/tests/System/AnnotationsTest.php b/plugins/Annotations/tests/System/AnnotationsTest.php index d385d33426..ef0a477e89 100644 --- a/plugins/Annotations/tests/System/AnnotationsTest.php +++ b/plugins/Annotations/tests/System/AnnotationsTest.php @@ -52,6 +52,10 @@ class AnnotationsTest extends SystemTestCase 'otherRequestParameters' => array('lastN' => 6), 'testSuffix' => '_lastN')), array('Annotations.getAll', array('idSite' => $idSite1, + 'date' => '2012-01-26,2012-03-01', + 'periods' => array('week'), + 'testSuffix' => '_multiplePeriod')), + array('Annotations.getAll', array('idSite' => $idSite1, 'date' => '2012-01-15,2012-02-15', 'periods' => array('range'), 'otherRequestParameters' => array('lastN' => 6), diff --git a/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml b/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml new file mode 100644 index 0000000000..d3aecc147b --- /dev/null +++ b/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row key="1"> + <row> + <date>2012-01-26</date> + <note>16: Site 1 annotation for 2012-01-26</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>16</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-01-27</date> + <note>17: Site 1 annotation for 2012-01-27</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>17</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-02</date> + <note>18: Site 1 annotation for 2012-02-02</note> + <starred>1</starred> + <user>superUserLogin</user> + <idNote>18</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-03</date> + <note>19: Site 1 annotation for 2012-02-03</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>19</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-09</date> + <note>20: Site 1 annotation for 2012-02-09</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>20</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-10</date> + <note>21: Site 1 annotation for 2012-02-10</note> + <starred>1</starred> + <user>superUserLogin</user> + <idNote>21</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-16</date> + <note>22: Site 1 annotation for 2012-02-16</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>22</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-17</date> + <note>23: Site 1 annotation for 2012-02-17</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>23</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-23</date> + <note>24: Site 1 annotation for 2012-02-23</note> + <starred>1</starred> + <user>superUserLogin</user> + <idNote>24</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + <row> + <date>2012-02-24</date> + <note>25: Site 1 annotation for 2012-02-24</note> + <starred>0</starred> + <user>superUserLogin</user> + <idNote>25</idNote> + <canEditOrDelete>1</canEditOrDelete> + </row> + </row> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/ArchiveCronTest.php b/plugins/CoreConsole/tests/System/ArchiveCronTest.php index 540842da21..75d7658f9f 100644 --- a/plugins/CoreConsole/tests/System/ArchiveCronTest.php +++ b/plugins/CoreConsole/tests/System/ArchiveCronTest.php @@ -64,14 +64,14 @@ class ArchiveCronTest extends SystemTestCase $segments = array(ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED, ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED ); - foreach($segments as $segment) { + foreach($segments as $index => $segment) { // Test with a pre-processed segment $results[] = array(array('VisitsSummary.get', 'Live.getLastVisitsDetails', 'VisitFrequency.get'), array('idSite' => '1', 'date' => '2012-08-09', 'periods' => array('day', 'year'), 'segment' => $segment, - 'testSuffix' => '_preArchivedSegment', + 'testSuffix' => '_preArchivedSegment' . $index, 'otherRequestParameters' => array( 'hideColumns' => 'latitude,longitude' )) diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml index 3f55efcd05..2ae3a02ea7 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml @@ -15,12 +15,12 @@ </result> <result idSite="2" /> <result idSite="3"> - <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> + <nb_uniq_visitors_returning>2</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_returning>2</nb_visits_returning> + <nb_actions_returning>2</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> - <bounce_count_returning>1</bounce_count_returning> + <bounce_count_returning>2</bounce_count_returning> <sum_visit_length_returning>0</sum_visit_length_returning> <max_actions_returning>1</max_actions_returning> <bounce_rate_returning>100%</bounce_rate_returning> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 64370a2ffb..5b6bd97c42 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -3,7 +3,7 @@ <row> <idSite>1</idSite> <idVisit>9</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>175.41.192.9</visitIp> <actionDetails> <row> @@ -106,15 +106,15 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> - <location>Unknown</location> + <location>Japan</location> <visitLocalTime>21:00:42</visitLocalTime> <visitLocalHour>21</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> @@ -127,7 +127,7 @@ <row> <idSite>1</idSite> <idVisit>8</idVisit> - <visitIp>0.0.0.0</visitIp> + <visitIp>175.41.192.9</visitIp> <actionDetails> <row> @@ -230,15 +230,15 @@ <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> - <continent>Unknown</continent> - <continentCode>unk</continentCode> - <country>Unknown</country> - <countryCode>xx</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> <region /> <regionCode /> <city /> - <location>Unknown</location> + <location>Japan</location> <visitLocalTime>20:56:45</visitLocalTime> <visitLocalHour>20</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index 5300e03f4f..060f9cbe79 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -635,6 +635,163 @@ </row> <row> <idSite>1</idSite> + <idVisit>28</idVisit> + <visitIp>0.0.0.0</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <pageTitle>Piwik Forums</pageTitle> + <pageIdAction>31</pageIdAction> + + + <pageId>31</pageId> + <bandwidth>43</bandwidth> + <interactionPosition>1</interactionPosition> + <title>Piwik Forums</title> + <subtitle>http://forum.piwik.org/register.php?0,approve=9a94a02145599</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>43 B</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>31</goalPageId> + + <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>website</referrerType> + <referrerTypeName>Websites</referrerTypeName> + <referrerName>sn110w.snt110.mail.live.com</referrerName> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 11.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>11.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <visitLocalTime>08:00:47</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>444</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> + <resolution>1280x800</resolution> + <plugins>cookie, director, flash, gears, java, pdf, windowsmedia</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> + <pluginName>director</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> + <pluginName>gears</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> + </pluginsIcons> + </row> + <row> + <idSite>1</idSite> <idVisit>25</idVisit> <visitIp>175.41.192.41</visitIp> @@ -1460,119 +1617,4 @@ <plugins /> <pluginsIcons /> </row> - <row> - <idSite>1</idSite> - <idVisit>18</idVisit> - <visitIp>1.2.3.4</visitIp> - - <actionDetails> - <row> - <type>download</type> - <url>http://piwik.net/19.pdf</url> - <pageTitle /> - <pageIdAction>16</pageIdAction> - - - <pageId>18</pageId> - <bandwidth>4324023</bandwidth> - <interactionPosition /> - <icon>plugins/Morpheus/images/download.svg</icon> - <title>Download</title> - <subtitle>http://piwik.net/19.pdf</subtitle> - - <customVariables> - <row> - <customVariablePageName1>HTTP-code</customVariablePageName1> - <customVariablePageValue1>200</customVariablePageValue1> - </row> - </customVariables> - <bandwidth_pretty>4.1 M</bandwidth_pretty> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <siteName>Piwik test</siteName> - - - - - - - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> - <searches>0</searches> - <actions>1</actions> - <interactions>0</interactions> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <referrerSocialNetworkUrl /> - <referrerSocialNetworkIcon /> - <languageCode /> - <language>Unknown</language> - <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> - <deviceModel>Unknown</deviceModel> - <operatingSystem>Unknown</operatingSystem> - <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemVersion>UNK</operatingSystemVersion> - <browserFamily /> - <browserFamilyDescription>Unknown</browserFamilyDescription> - <browser>Unknown</browser> - <browserName>Unknown</browserName> - <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> - <browserCode>UNK</browserCode> - <browserVersion /> - <totalEcommerceRevenue>0</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> - <events>0</events> - <continent>Oceania</continent> - <continentCode>oce</continentCode> - <country>Australia</country> - <countryCode>au</countryCode> - <countryFlag>plugins/Morpheus/icons/dist/flags/au.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>Australia</location> - <visitLocalTime>17:46:03</visitLocalTime> - <visitLocalHour>17</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - <customVariables> - <row> - <customVariableName1>Not-Bot</customVariableName1> - <customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1> - </row> - </customVariables> - <resolution>unknown</resolution> - <plugins /> - <pluginsIcons /> - </row> </result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml index c415099916..c415099916 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml new file mode 100644 index 0000000000..05d0ce3953 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <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> + <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> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_day.xml index 93a593f72a..93a593f72a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_day.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml index 157967c9a3..5d42e5f7f4 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>33</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>31</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>34</nb_visits> + <nb_actions>46</nb_actions> + <nb_visits_converted>32</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>359</sum_visit_length> <max_actions>10</max_actions> <bounce_rate>91%</bounce_rate> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..5b6bd97c42 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,1243 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>9</idVisit> + <visitIp>175.41.192.9</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-users/</url> + <pageTitle /> + <pageIdAction>9</pageIdAction> + + + <pageId>9</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-users/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>9</goalPageId> + + <url>http://piwik.net/docs/manage-users/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.8</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.8</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 19.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>19.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>21:00:42</visitLocalTime> + <visitLocalHour>21</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>8</idVisit> + <visitIp>175.41.192.9</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/docs/</url> + <pageTitle /> + <pageIdAction>8</pageIdAction> + + + <pageId>8</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>8</goalPageId> + + <url>http://piwik.net/docs/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemName>GNU/Linux</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 6.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>6.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>20:56:45</visitLocalTime> + <visitLocalHour>20</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>7</idVisit> + <visitIp>72.44.32.10</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/translations/</url> + <pageTitle /> + <pageIdAction>7</pageIdAction> + + + <pageId>7</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/translations/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>7</goalPageId> + + <url>http://piwik.net/translations/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemName>GNU/Linux</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 19.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>19.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <visitLocalTime>13:49:48</visitLocalTime> + <visitLocalHour>13</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>6</idVisit> + <visitIp>72.44.32.10</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/download/counter/</url> + <pageTitle /> + <pageIdAction>6</pageIdAction> + + + <pageId>6</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/download/counter/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>6</goalPageId> + + <url>http://piwik.net/download/counter/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemName>GNU/Linux</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>GNOME Web 2.30</browser> + <browserName>GNOME Web</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <visitLocalTime>13:48:20</visitLocalTime> + <visitLocalHour>13</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>5</idVisit> + <visitIp>72.44.32.10</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/</url> + <pageTitle /> + <pageIdAction>5</pageIdAction> + + + <pageId>5</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>5</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <visitLocalTime>13:48:07</visitLocalTime> + <visitLocalHour>13</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>4</idVisit> + <visitIp>175.41.192.40</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-websites/</url> + <pageTitle /> + <pageIdAction>4</pageIdAction> + + + <pageId>4</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>4</goalPageId> + + <url>http://piwik.net/docs/manage-websites/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemName>GNU/Linux</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 6.0</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>6.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:12:03</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>3</idVisit> + <visitIp>175.41.192.40</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/community/</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <pageId>3</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>3</goalPageId> + + <url>http://piwik.net/blog/category/community/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>GNU/Linux</operatingSystem> + <operatingSystemName>GNU/Linux</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> + <operatingSystemCode>LIN</operatingSystemCode> + <operatingSystemVersion /> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>GNOME Web 2.30</browser> + <browserName>GNOME Web</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> + <browserCode>EP</browserCode> + <browserVersion>2.30</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:11:56</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>175.41.192.40</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>2</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>2</goalPageId> + + <url>http://piwik.net/faq/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Smartphone</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/smartphone.png</deviceTypeIcon> + <deviceBrand>HTC</deviceBrand> + <deviceModel>Vision</deviceModel> + <operatingSystem>Android 2.3</operatingSystem> + <operatingSystemName>Android</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> + <operatingSystemCode>AND</operatingSystemCode> + <operatingSystemVersion>2.3</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Android Browser</browser> + <browserName>Android Browser</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> + <browserCode>AN</browserCode> + <browserVersion /> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:11:30</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>59</idVisit> + <visitIp>175.41.193.46</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.included4.com/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>57</pageIdAction> + + + <pageId>81</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://www.included4.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>81</goalPageId> + + <url>http://www.included4.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:10:39</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>61</idVisit> + <visitIp>175.41.191.46</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.included2.com/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>59</pageIdAction> + + + <pageId>83</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://www.included2.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>83</goalPageId> + + <url>http://www.included2.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Singapore</country> + <countryCode>sg</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Singapore</location> + <visitLocalTime>08:10:39</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml new file mode 100644 index 0000000000..060f9cbe79 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -0,0 +1,1620 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>57</idVisit> + <visitIp>175.41.192.40</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>70</pageId> + <bandwidth /> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <generationTimeMilliseconds>123</generationTimeMilliseconds> + <generationTime>0.12s</generationTime> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>70</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>74</pageId> + <bandwidth /> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <generationTimeMilliseconds>120</generationTimeMilliseconds> + <generationTime>0.12s</generationTime> + <interactionPosition>5</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>78</pageId> + <bandwidth /> + <timeSpent>52</timeSpent> + <timeSpentPretty>52s</timeSpentPretty> + <generationTimeMilliseconds>23</generationTimeMilliseconds> + <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>71</pageId> + <bandwidth /> + <timeSpent>50</timeSpent> + <timeSpentPretty>50s</timeSpentPretty> + <generationTimeMilliseconds>234</generationTimeMilliseconds> + <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>75</pageId> + <bandwidth /> + <timeSpent>49</timeSpent> + <timeSpentPretty>49s</timeSpentPretty> + <generationTimeMilliseconds>294</generationTimeMilliseconds> + <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>79</pageId> + <bandwidth /> + <timeSpent>26</timeSpent> + <timeSpentPretty>26s</timeSpentPretty> + <generationTimeMilliseconds>237</generationTimeMilliseconds> + <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/community/</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <pageId>72</pageId> + <bandwidth /> + <timeSpent>26</timeSpent> + <timeSpentPretty>26s</timeSpentPretty> + <generationTimeMilliseconds>1324</generationTimeMilliseconds> + <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/community/</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <pageId>76</pageId> + <bandwidth /> + <timeSpent>7</timeSpent> + <timeSpentPretty>7s</timeSpentPretty> + <generationTimeMilliseconds>624</generationTimeMilliseconds> + <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-websites/</url> + <pageTitle /> + <pageIdAction>4</pageIdAction> + + + <pageId>73</pageId> + <bandwidth /> + <timeSpent>8</timeSpent> + <timeSpentPretty>8s</timeSpentPretty> + <generationTimeMilliseconds>543</generationTimeMilliseconds> + <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-websites/</url> + <pageTitle /> + <pageIdAction>4</pageIdAction> + + + <pageId>77</pageId> + <bandwidth /> + <generationTimeMilliseconds>343</generationTimeMilliseconds> + <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>54</visitDuration> + <visitDurationPretty>54s</visitDurationPretty> + <searches>0</searches> + <actions>10</actions> + <interactions>10</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Unknown</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Unknown</deviceModel> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemName>Unknown</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:10:38</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>62</idVisit> + <visitIp>175.41.191.47</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>60</pageIdAction> + + + <pageId>84</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>84</goalPageId> + + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Singapore</country> + <countryCode>sg</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Singapore</location> + <visitLocalTime>08:10:38</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>27</idVisit> + <visitIp>0.0.0.0</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>incredible title!</pageTitle> + <pageIdAction>29</pageIdAction> + + + <pageId>30</pageId> + <bandwidth>43</bandwidth> + <interactionPosition>1</interactionPosition> + <title>incredible title!</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName3>_pks</customVariablePageName3> + <customVariablePageValue3>SKU2</customVariablePageValue3> + </row> + <row> + <customVariablePageName4>_pkn</customVariablePageName4> + <customVariablePageValue4>PRODUCT name</customVariablePageValue4> + </row> + <row> + <customVariablePageName5>_pkc</customVariablePageName5> + <customVariablePageValue5>Electronics & Cameras</customVariablePageValue5> + </row> + </customVariables> + <bandwidth_pretty>43 B</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>30</goalPageId> + + <url>http://example.org/index.htm</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>website</referrerType> + <referrerTypeName>Websites</referrerTypeName> + <referrerName>piwik.org</referrerName> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl>http://piwik.org/contribute%</referrerUrl> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 6.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>6.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + <resolution>1024x768</resolution> + <plugins>cookie, flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + </row> + <row> + <idSite>1</idSite> + <idVisit>28</idVisit> + <visitIp>0.0.0.0</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <pageTitle>Piwik Forums</pageTitle> + <pageIdAction>31</pageIdAction> + + + <pageId>31</pageId> + <bandwidth>43</bandwidth> + <interactionPosition>1</interactionPosition> + <title>Piwik Forums</title> + <subtitle>http://forum.piwik.org/register.php?0,approve=9a94a02145599</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>43 B</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>31</goalPageId> + + <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>website</referrerType> + <referrerTypeName>Websites</referrerTypeName> + <referrerName>sn110w.snt110.mail.live.com</referrerName> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</referrerUrl> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>Chrome 11.0</browser> + <browserName>Chrome</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>11.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Unknown</continent> + <continentCode>unk</continentCode> + <country>Unknown</country> + <countryCode>xx</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Unknown</location> + <visitLocalTime>08:00:47</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>444</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName3>Forum status</customVariableName3> + <customVariableValue3>Anonymous</customVariableValue3> + </row> + </customVariables> + <resolution>1280x800</resolution> + <plugins>cookie, director, flash, gears, java, pdf, windowsmedia</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> + <pluginName>director</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> + <pluginName>gears</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> + <pluginName>windowsmedia</pluginName> + </row> + </pluginsIcons> + </row> + <row> + <idSite>1</idSite> + <idVisit>25</idVisit> + <visitIp>175.41.192.41</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>28</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>28</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>20:15:41</visitLocalTime> + <visitLocalHour>20</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>26</idVisit> + <visitIp>::ffff:123.45.67.89</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>29</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>South Korea</country> + <countryCode>kr</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/kr.png</countryFlag> + <region>Seoul Teugbyeolsi</region> + <regionCode>11</regionCode> + <city>Seoul</city> + <location>Seoul, Seoul Teugbyeolsi, South Korea</location> + <visitLocalTime>20:15:41</visitLocalTime> + <visitLocalHour>20</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>24</idVisit> + <visitIp>175.41.192.43</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/moved-permanently</url> + <pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</pageTitle> + <pageIdAction>25</pageIdAction> + + + <pageId>26</pageId> + <bandwidth>3574</bandwidth> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <interactionPosition>1</interactionPosition> + <title>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</title> + <subtitle>http://piwik.net/moved-permanently</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>301</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>26</goalPageId> + + <url>http://piwik.net/moved-permanently</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + <row> + <type>action</type> + <url>http://piwik.net/temp-redirect</url> + <pageTitle>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</pageTitle> + <pageIdAction>27</pageIdAction> + + + <pageId>27</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>2</interactionPosition> + <title>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</title> + <subtitle>http://piwik.net/temp-redirect</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>307</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>182</visitDuration> + <visitDurationPretty>3 min 2s</visitDurationPretty> + <searches>0</searches> + <actions>2</actions> + <interactions>2</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>19:12:40</visitLocalTime> + <visitLocalHour>19</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>23</idVisit> + <visitIp>175.41.192.42</visitIp> + + <actionDetails> + <row> + <type>download</type> + <url>http://piwik.net/thing.js</url> + <pageTitle /> + <pageIdAction>21</pageIdAction> + + + <pageId>23</pageId> + <bandwidth>3574</bandwidth> + <timeSpent>61</timeSpent> + <timeSpentPretty>1 min 1s</timeSpentPretty> + <interactionPosition /> + <icon>plugins/Morpheus/images/download.svg</icon> + <title>Download</title> + <subtitle>http://piwik.net/thing.js</subtitle> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>download</type> + <url>http://piwik.net/thing.css</url> + <pageTitle /> + <pageIdAction>22</pageIdAction> + + + <pageId>24</pageId> + <bandwidth>3574</bandwidth> + <timeSpent>61</timeSpent> + <timeSpentPretty>1 min 1s</timeSpentPretty> + <interactionPosition /> + <icon>plugins/Morpheus/images/download.svg</icon> + <title>Download</title> + <subtitle>http://piwik.net/thing.css</subtitle> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>download</type> + <url>http://piwik.net/other.png</url> + <pageTitle /> + <pageIdAction>23</pageIdAction> + + + <pageId>25</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition /> + <icon>plugins/Morpheus/images/download.svg</icon> + <title>Download</title> + <subtitle>http://piwik.net/other.png</subtitle> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>123</visitDuration> + <visitDurationPretty>2 min 3s</visitDurationPretty> + <searches>0</searches> + <actions>3</actions> + <interactions>0</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Apple</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>18:10:38</visitLocalTime> + <visitLocalHour>18</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>22</idVisit> + <visitIp>72.44.32.11</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/</url> + <pageTitle /> + <pageIdAction>5</pageIdAction> + + + <pageId>22</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://piwik.net/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>22</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Unknown</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Unknown</deviceModel> + <operatingSystem>Bot</operatingSystem> + <operatingSystemName>Bot</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <visitLocalTime>17:48:08</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Bot</customVariableName1> + <customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>21</idVisit> + <visitIp>72.44.32.11</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://piwik.net/to-an-error</url> + <pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle> + <pageIdAction>20</pageIdAction> + + + <pageId>21</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</title> + <subtitle>http://piwik.net/to-an-error</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>500</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>21</goalPageId> + + <url>http://piwik.net/to-an-error</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion</title> + <subtitle>all ($ 5 revenue)</subtitle> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <interactions>1</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>7</operatingSystemVersion> + <browserFamily>Trident</browserFamily> + <browserFamilyDescription>Trident (IE)</browserFamilyDescription> + <browser>Internet Explorer 9.0</browser> + <browserName>Internet Explorer</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> + <browserCode>IE</browserCode> + <browserVersion>9.0</browserVersion> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>North America</continent> + <continentCode>amn</continentCode> + <country>United States</country> + <countryCode>us</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag> + <region>Virginia</region> + <regionCode>VA</regionCode> + <city>Ashburn</city> + <location>Ashburn, Virginia, United States</location> + <visitLocalTime>17:48:07</visitLocalTime> + <visitLocalHour>17</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml new file mode 100644 index 0000000000..c415099916 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning> + <nb_users_returning>0</nb_users_returning> + <nb_visits_returning>0</nb_visits_returning> + <nb_actions_returning>0</nb_actions_returning> + <nb_visits_converted_returning>0</nb_visits_converted_returning> + <bounce_count_returning>0</bounce_count_returning> + <sum_visit_length_returning>0</sum_visit_length_returning> + <max_actions_returning>0</max_actions_returning> + <bounce_rate_returning>0%</bounce_rate_returning> + <nb_actions_per_visit_returning>0</nb_actions_per_visit_returning> + <avg_time_on_site_returning>0</avg_time_on_site_returning> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml index dafefc726a..dafefc726a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml new file mode 100644 index 0000000000..93a593f72a --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_users>0</nb_users> + <nb_visits>11</nb_visits> + <nb_actions>11</nb_actions> + <nb_visits_converted>11</nb_visits_converted> + <bounce_count>11</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml new file mode 100644 index 0000000000..5d42e5f7f4 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>34</nb_visits> + <nb_actions>46</nb_actions> + <nb_visits_converted>32</nb_visits_converted> + <bounce_count>31</bounce_count> + <sum_visit_length>359</sum_visit_length> + <max_actions>10</max_actions> + <bounce_rate>91%</bounce_rate> + <nb_actions_per_visit>1.4</nb_actions_per_visit> + <avg_time_on_site>11</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml index f52b091919..0c309903aa 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_uniq_visitors>32</nb_uniq_visitors> + <nb_uniq_visitors>33</nb_uniq_visitors> <nb_users>1</nb_users> - <nb_visits>32</nb_visits> - <nb_actions>35</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>33</nb_visits> + <nb_actions>36</nb_actions> + <nb_visits_converted>31</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>305</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>94%</bounce_rate> <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>10</avg_time_on_site> + <avg_time_on_site>9</avg_time_on_site> </result> <result idSite="2" /> <result idSite="3" /> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml index d35a916d0e..52f8ea31e7 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_visits>33</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>31</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>34</nb_visits> + <nb_actions>46</nb_actions> + <nb_visits_converted>32</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>359</sum_visit_length> <max_actions>10</max_actions> <bounce_rate>91%</bounce_rate> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml index f52b091919..0c309903aa 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_uniq_visitors>32</nb_uniq_visitors> + <nb_uniq_visitors>33</nb_uniq_visitors> <nb_users>1</nb_users> - <nb_visits>32</nb_visits> - <nb_actions>35</nb_actions> - <nb_visits_converted>30</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>33</nb_visits> + <nb_actions>36</nb_actions> + <nb_visits_converted>31</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>305</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>94%</bounce_rate> <nb_actions_per_visit>1.1</nb_actions_per_visit> - <avg_time_on_site>10</avg_time_on_site> + <avg_time_on_site>9</avg_time_on_site> </result> <result idSite="2" /> <result idSite="3" /> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml index d35a916d0e..52f8ea31e7 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_visits>33</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>31</nb_visits_converted> - <bounce_count>30</bounce_count> + <nb_visits>34</nb_visits> + <nb_actions>46</nb_actions> + <nb_visits_converted>32</nb_visits_converted> + <bounce_count>31</bounce_count> <sum_visit_length>359</sum_visit_length> <max_actions>10</max_actions> <bounce_rate>91%</bounce_rate> diff --git a/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php b/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php index e0ce8fa5be..736b199979 100644 --- a/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php +++ b/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php @@ -29,6 +29,11 @@ class VisitorDaysSinceFirst extends VisitDimension */ public function onNewVisit(Request $request, Visitor $visitor, $action) { + // if the visitor is new, force days since first to 0, to ignore any potential bad values for _idts + if (!$visitor->isVisitorKnown()) { + return 0; + } + return $request->getDaysSinceFirstVisit(); } diff --git a/plugins/CoreHome/Tracker/VisitRequestProcessor.php b/plugins/CoreHome/Tracker/VisitRequestProcessor.php index c2a88e93d4..55d2938b7d 100644 --- a/plugins/CoreHome/Tracker/VisitRequestProcessor.php +++ b/plugins/CoreHome/Tracker/VisitRequestProcessor.php @@ -112,6 +112,10 @@ class VisitRequestProcessor extends RequestProcessor $isNewVisit = $this->isVisitNew($visitProperties, $request); $request->setMetadata('CoreHome', 'isNewVisit', $isNewVisit); + if (!$isNewVisit) { // only copy over known visitor's information, if this is for an ongoing visit + $this->visitorRecognizer->updateVisitPropertiesFromLastVisitRow($visitProperties); + } + return false; } diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index 6cf4a2697a..86cfd15787 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -103,7 +103,7 @@ abstract class Graph extends Visualization { $isVisible = true; if ('label' == $this->config->row_picker_match_rows_by) { - $isVisible = in_array($rowLabel, $this->config->rows_to_display); + $isVisible = in_array($rowLabel, $this->config->rows_to_display === false ? [] : $this->config->rows_to_display); } return $isVisible; diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index adcf8e2bda..522eed6ae5 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations; use Piwik\API\Request as ApiRequest; use Piwik\Common; +use Piwik\DataTable\Row; use Piwik\Metrics; use Piwik\Period; use Piwik\Plugin\Visualization; @@ -104,4 +105,16 @@ class HtmlTable extends Visualization { return $this->requestConfig->pivotBy || Common::getRequestVar('pivotBy', ''); } + + /** + * Override to compute a custom cell HTML attributes (such as style). + * + * @param Row $row + * @param $column + * @return array Array of name => value pairs. + */ + public function getCellHtmlAttributes(Row $row, $column) + { + return null; + } } diff --git a/plugins/CoreVisualizations/javascripts/seriesPicker.js b/plugins/CoreVisualizations/javascripts/seriesPicker.js index 206ea750b4..7ed7c6ced7 100644 --- a/plugins/CoreVisualizations/javascripts/seriesPicker.js +++ b/plugins/CoreVisualizations/javascripts/seriesPicker.js @@ -91,7 +91,7 @@ + ' selected-rows="selectedRows"' + ' on-select="selectionChanged(columns, rows)"/>'; - this.domElem = $(seriesPicker); // TODO: don't know if this will work without a root scope + this.domElem = $(seriesPicker); $(this).trigger('placeSeriesPicker'); @@ -106,6 +106,8 @@ return; } + rows = rows.map(encodeURIComponent); + $(self).trigger('seriesPicked', [columns, rows]); // inform dashboard widget about changed parameters (to be restored on reload) diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 2d4a25e950..10c28ff40b 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -38,7 +38,8 @@ class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}" {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}> {% for column in properties.columns_to_display %} - <td> + {% set cellAttributes = visualization.getCellHtmlAttributes(row, column) %} + <td {% if cellAttributes is not empty %}{% for name, value in cellAttributes %}{{ name|e('html') }}="{{ value|e('html_attr') }}" {% endfor %}{% endif %}> {% include "@CoreHome/_dataTableCell.twig" with properties %} </td> {% endfor %} diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml index de19b588f6..d6790fc1ae 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml @@ -7,7 +7,7 @@ <nb_actions>2</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>6</sum_visit_length> <bounce_count>4</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml index b05ae70087..6442db0437 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml @@ -7,7 +7,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>3</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -27,7 +27,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>3</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml index bab8a9f0cf..069641e689 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml @@ -7,7 +7,7 @@ <nb_actions>3</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>1084</sum_visit_length> + <sum_visit_length>1087</sum_visit_length> <bounce_count>4</bounce_count> <goals> <row idgoal='1'> @@ -28,7 +28,7 @@ <nb_actions>3</nb_actions> <nb_users>0</nb_users> <max_actions>2</max_actions> - <sum_visit_length>721</sum_visit_length> + <sum_visit_length>724</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php index 1817a4d336..42833613df 100644 --- a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php +++ b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php @@ -41,12 +41,12 @@ Statistics for the archive_numeric_2010_03 and archive_blob_2010_03 tables: +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ | Group | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows | # Blob Data | +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ -| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | -| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | +| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | +| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | | day[2010-03-03 - 2010-03-03] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-04 - 2010-03-04] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-05 - 2010-03-05] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | -| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 72 | %d | +| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 72 | %d | | day[2010-03-07 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-08 - 2010-03-08] idSite = 1 | 5 | 0 | 0 | 0 | 4 | 0 | 0 | | | week[2010-03-08 - 2010-03-14] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml index 537029b08e..49a8e28d1d 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml @@ -5,8 +5,8 @@ <nb_visits>45</nb_visits> <nb_actions>70</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>25</sum_visit_length> - <bounce_count>25</bounce_count> + <sum_visit_length>24</sum_visit_length> + <bounce_count>26</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>11</sum_daily_nb_users> diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml index f22cfae43b..171c2ae454 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml @@ -5,8 +5,8 @@ <nb_visits>195</nb_visits> <nb_actions>264</nb_actions> <nb_visits_converted>0</nb_visits_converted> - <bounce_count>130</bounce_count> - <sum_visit_length>80</sum_visit_length> + <bounce_count>131</bounce_count> + <sum_visit_length>79</sum_visit_length> <max_actions>3</max_actions> <bounce_rate>67%</bounce_rate> <nb_actions_per_visit>1.4</nb_actions_per_visit> diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml index f88f48454a..0be3977a33 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml @@ -5,8 +5,8 @@ <nb_visits>45</nb_visits> <nb_actions>70</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>25</sum_visit_length> - <bounce_count>25</bounce_count> + <sum_visit_length>24</sum_visit_length> + <bounce_count>26</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>11</sum_daily_nb_users> diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml index 4e9a3bd824..97edda327c 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml @@ -5,10 +5,10 @@ <nb_visits>57</nb_visits> <nb_actions>88</nb_actions> <nb_visits_converted>0</nb_visits_converted> - <bounce_count>32</bounce_count> - <sum_visit_length>31</sum_visit_length> + <bounce_count>33</bounce_count> + <sum_visit_length>30</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>56%</bounce_rate> + <bounce_rate>58%</bounce_rate> <nb_actions_per_visit>1.5</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result>
\ No newline at end of file diff --git a/plugins/Goals/Columns/Metrics/GoalConversionRate.php b/plugins/Goals/Columns/Metrics/GoalConversionRate.php index 9fb476044a..f81d188248 100644 --- a/plugins/Goals/Columns/Metrics/GoalConversionRate.php +++ b/plugins/Goals/Columns/Metrics/GoalConversionRate.php @@ -52,7 +52,7 @@ class GoalConversionRate extends GoalSpecificProcessedMetric public function compute(Row $row) { $nbVisits = $this->getMetric($row, 'nb_visits'); - $conversions = $this->getMetric($row, Goals::makeGoalColumn($this->idGoal, 'nb_conversions')); + $conversions = $this->getMetric($row, Goals::makeGoalColumn($this->idGoal, 'nb_visits_converted')); return Piwik::getQuotientSafe($conversions, $nbVisits, GoalManager::REVENUE_PRECISION + 2); } diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml index 2c07daa5b1..1119251100 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml @@ -7,7 +7,7 @@ <nb_conversions_new_visit>3</nb_conversions_new_visit> <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> <revenue_new_visit>1000</revenue_new_visit> - <conversion_rate_new_visit>66.67%</conversion_rate_new_visit> + <conversion_rate_new_visit>100%</conversion_rate_new_visit> <nb_conversions_returning_visit>0</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml index 61d25f1d46..85320944d4 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml @@ -13,7 +13,7 @@ <goal_1_conversion_rate>66.67%</goal_1_conversion_rate> <goal_2_conversion_rate>33.33%</goal_2_conversion_rate> <conversion_rate>66.67%</conversion_rate> - <nb_visits_new_visit>3</nb_visits_new_visit> + <nb_visits_new_visit>2</nb_visits_new_visit> <nb_conversions_new_visit>3</nb_conversions_new_visit> <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> <revenue_new_visit>1000</revenue_new_visit> @@ -23,10 +23,10 @@ <goal_2_nb_conversions_new_visit>1</goal_2_nb_conversions_new_visit> <goal_2_nb_visits_converted_new_visit>1</goal_2_nb_visits_converted_new_visit> <goal_2_revenue_new_visit>0</goal_2_revenue_new_visit> - <goal_1_conversion_rate_new_visit>66.67%</goal_1_conversion_rate_new_visit> - <goal_2_conversion_rate_new_visit>33.33%</goal_2_conversion_rate_new_visit> - <conversion_rate_new_visit>66.67%</conversion_rate_new_visit> - <nb_visits_returning_visit>0</nb_visits_returning_visit> + <goal_1_conversion_rate_new_visit>100%</goal_1_conversion_rate_new_visit> + <goal_2_conversion_rate_new_visit>50%</goal_2_conversion_rate_new_visit> + <conversion_rate_new_visit>100%</conversion_rate_new_visit> + <nb_visits_returning_visit>1</nb_visits_returning_visit> <nb_conversions_returning_visit>0</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml index a457e430c6..ffb10e4cc0 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <goal_1_conversion_rate>66.67%</goal_1_conversion_rate> - <goal_1_conversion_rate_new_visit>66.67%</goal_1_conversion_rate_new_visit> + <goal_1_conversion_rate>0%</goal_1_conversion_rate> + <goal_1_conversion_rate_new_visit>0%</goal_1_conversion_rate_new_visit> <goal_1_conversion_rate_returning_visit>0%</goal_1_conversion_rate_returning_visit> </result>
\ No newline at end of file diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png index 60847a7c09..de66647b67 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc3c513800c1574b598ac3a90e64de20a9df53b51b058ab63c106ff31299247 -size 401152 +oid sha256:aad3b53871687402544b5c57156ac0267d8a877d144b6f8bfb77e10d90a1d226 +size 406036 diff --git a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php index bea167e3b2..e858b0cefe 100644 --- a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php +++ b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php @@ -322,6 +322,7 @@ class MultipleSitesMultipleVisitsFixture extends Fixture { for ($day = 0; $day < $numIterations; $day++) { // we track over several days to make sure we have some data to aggregate in week reports + // NOTE: some action times are out of order in visits on purpose if ($day > 0) { $this->trackingTime = Date::factory($this->dateTime)->addDay($day * 3)->getDatetime(); diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json index b72d6b4b03..a2d3735a74 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json @@ -11949,4 +11949,4 @@ "name": "My product 211" } ] -} +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json index 11f251897d..60da4c0cf4 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json @@ -4526,4 +4526,4 @@ "name": "My product 211" } ] -} +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json index 499ae92c76..9280745a96 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json @@ -12398,4 +12398,4 @@ "name": "My product 211" } ] -} +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json index 640d1ad173..fee651760c 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json @@ -12174,4 +12174,4 @@ "name": "My product 211" } ] -} +}
\ No newline at end of file diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 99eed03f2c..02be6bfac2 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -286,6 +286,7 @@ class Controller extends \Piwik\Plugin\Controller if ($visibleRows !== false) { // this happens when the row picker has been used $visibleRows = Piwik::getArrayFromApiParameter($visibleRows); + $visibleRows = array_map('urldecode', $visibleRows); // typeReferrer is redundant if rows are defined, so make sure it's not used $view->config->custom_parameters['typeReferrer'] = false; diff --git a/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original b/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original Binary files differindex 5952fe079e..6c9207ed0a 100644 --- a/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original +++ b/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original diff --git a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml index c8a2c198e8..8a30aedd0a 100644 --- a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml +++ b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml @@ -6,7 +6,7 @@ <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>7</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> diff --git a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml index c8a2c198e8..8a30aedd0a 100644 --- a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml +++ b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml @@ -6,7 +6,7 @@ <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>7</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index d687709eb9..ce31f20bd0 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -118,7 +118,8 @@ class ManyVisitsWithGeoIP extends Fixture } $t->setTokenAuth(self::getTokenAuth()); for ($i = 0; $i != $visitorCount; ++$i) { - $t->setVisitorId( substr(md5($i + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); + // NOTE: floor() is so some visits share the same visit ID + $t->setVisitorId( substr(md5(floor($i / 2) + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); $userAgent = null; if ($setIp) { diff --git a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php index c9c7576954..5a4e83fff3 100644 --- a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php @@ -167,6 +167,10 @@ class ThreeVisitsWithCustomEvents extends Fixture $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('Movie', 'play25%', 'Spirited Away (千と千尋の神隠し)')); + // trackEvent without a name + $this->moveTimeForward($vis, 150); + self::checkResponse($vis->doTrackEvent('Movie', 'Search')); + // taking 2+ hours break & resuming this epic moment of cinema $this->moveTimeForward($vis, 200); @@ -177,15 +181,8 @@ class ThreeVisitsWithCustomEvents extends Fixture $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('Movie', 'play75%', 'Spirited Away (千と千尋の神隠し)')); - // trackEvent without a name - $this->moveTimeForward($vis, 150); - self::checkResponse($vis->doTrackEvent('Movie', 'Search')); $this->moveTimeForward($vis, 251); self::checkResponse($vis->doTrackEvent('Movie', 'Search', 'Search query here')); - $this->moveTimeForward($vis, 352); - self::checkResponse($vis->doTrackEvent('Movie', 'Search')); - $this->moveTimeForward($vis, 453); - self::checkResponse($vis->doTrackEvent('Movie', 'Purchase')); $this->moveTimeForward($vis, 266); $this->setMovieEventCustomVar($vis); @@ -204,6 +201,11 @@ class ThreeVisitsWithCustomEvents extends Fixture $this->moveTimeForward($vis, 280); $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('event category ' . $append, 'event action '.$append, 'event name '.$append, 9.66)); + + $this->moveTimeForward($vis, 352); + self::checkResponse($vis->doTrackEvent('Movie', 'Search')); + $this->moveTimeForward($vis, 453); + self::checkResponse($vis->doTrackEvent('Movie', 'Purchase')); } private function setMusicEventCustomVar(PiwikTracker $vis) diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php index ec1c2bc8f5..8454aeef8d 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php +++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php @@ -144,7 +144,7 @@ class TwoSitesEcommerceOrderWithItems extends Fixture // we test that both the order, and the products, are not updated on subsequent "Receipt" views $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.2)->getDatetime()); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR NOT!', $category = 'Electronics & Cameras NOT!', $price = 15000000000, $quantity = 10000); - self::checkResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); + self::checkTrackingFailureResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); // Leave with an opened cart // No category @@ -155,11 +155,11 @@ class TwoSitesEcommerceOrderWithItems extends Fixture // Record the same visit leaving twice an abandoned cart foreach (array(0, 5, 24) as $offsetHour) { $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($offsetHour + 2.4)->getDatetime()); - // Also recording an order the day after + // Also recording an order the day after (purposefully using old order ID, it should be ignored by the tracker since it was used in a previous visit) if ($offsetHour >= 24) { $t->setDebugStringAppend("&_idvc=1"); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR', $category = 'Electronics & Cameras', $price = 1500, $quantity = 1); - self::checkResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); + self::checkTrackingFailureResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); } // VIEW PRODUCT PAGES @@ -191,6 +191,7 @@ class TwoSitesEcommerceOrderWithItems extends Fixture // One more Ecommerce order, without any product in it, because we still track orders without products $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(30.8)->getDatetime()); self::checkResponse($t->doTrackEcommerceOrder($orderId4, $grandTotal = 10000)); + return array($defaultInit, $t, $category, $price, $sku, $name, $quantity, $grandTotal, $orderId); } diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index b75ae970a4..72e3151a51 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -642,6 +642,17 @@ class Fixture extends \PHPUnit_Framework_Assert ); } + public static function checkTrackingFailureResponse($response) + { + $trans_gif_64 = "R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="; + $expectedResponse = base64_decode($trans_gif_64); + + self::assertContains($expectedResponse, $response); + self::assertContains('This resource is part of Matomo.', $response); + self::assertNotContains('Error', $response); + self::assertNotContains('Fatal', $response); + } + /** * Checks that the response from bulk tracking is a valid JSON * string. Will fail the test if JSON status is not success. diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php index 40bb181fef..0798bd5a85 100644 --- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php @@ -127,7 +127,7 @@ class LogAggregatorTest extends IntegrationTestCase 2 => '1', 3 => '1', 4 => '1', - 5 => '0', + 5 => '1', 6 => '1', 7 => '1', 39 => '0', diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 676be3e875..4d8836f133 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -97,7 +97,11 @@ class BackwardsCompatibility1XTest extends SystemTestCase 'otherRequestParameters' => array( // when changing this, might also need to change the same line in OneVisitorTwoVisitsTest.php 'hideColumns' => 'nb_users,sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth', - ) + ), + 'xmlFieldsToRemove' => [ + 'entry_sum_visit_length', + 'sum_visit_length', + ], ); /** @@ -162,7 +166,11 @@ class BackwardsCompatibility1XTest extends SystemTestCase // system settings such as enable_plugin_update_communication are enabled by default in newest version, // but ugpraded Piwik are not - 'CorePluginsAdmin.getSystemSettings' + 'CorePluginsAdmin.getSystemSettings', + + // visit length changes slightly with change to previous visitor detection in #13935 + 'VisitsSummary.getSumVisitsLength', + 'VisitsSummary.getSumVisitsLengthPretty', ); $apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately); diff --git a/tests/PHPUnit/System/TrackerTest.php b/tests/PHPUnit/System/TrackerTest.php index cc627d2cbf..560e284bf2 100644 --- a/tests/PHPUnit/System/TrackerTest.php +++ b/tests/PHPUnit/System/TrackerTest.php @@ -148,6 +148,25 @@ class TrackerTest extends IntegrationTestCase $this->assertEquals(0, count($this->getConversionItems())); } + public function test_trackingEcommerceOrder_FailsWhenNonUniqueOrderIsUsed() + { + $ecItems = array(array("\"scarysku&", "superscarymovie'", 'scary <> movies', 12.99, 1)); + + $urlToTest = $this->getEcommerceItemsUrl($ecItems); + + $response = $this->sendTrackingRequestByCurl($urlToTest); + Fixture::checkResponse($response); + + $this->assertEquals(1, $this->getCountOfConversions()); + $this->assertEquals(1, count($this->getConversionItems())); + + $response = $this->sendTrackingRequestByCurl($urlToTest); + $this->assertContains('This resource is part of Matomo.', $response); + + $this->assertEquals(1, $this->getCountOfConversions()); + $this->assertEquals(1, count($this->getConversionItems())); + } + public function test_trackingWithLangParameter_ForwardsLangParameter_ToDefaultLocationProvider() { LocationProvider::$providers = null; diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml index 4020d6e477..eea13d15e3 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml @@ -51,7 +51,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>7</entry_nb_actions> - <entry_sum_visit_length>1621</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>180</avg_time_on_page> @@ -72,7 +72,7 @@ <max_time_generation>0.134</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_bandwidth>0</avg_bandwidth> @@ -95,7 +95,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <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_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index cc96799a61..33dabc6637 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml index 9a80fd221e..fd8023e642 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml index fa1dba18f0..05cc959a7a 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml @@ -7,7 +7,7 @@ <nb_conversions_new_visit>3</nb_conversions_new_visit> <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit> <revenue_new_visit>31</revenue_new_visit> - <conversion_rate_new_visit>10%</conversion_rate_new_visit> + <conversion_rate_new_visit>50%</conversion_rate_new_visit> <nb_conversions_returning_visit>0</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 68318d12a8..4d4bc94359 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -8,11 +8,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>24</pageId> + <pageId>27</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> @@ -39,8 +39,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -133,11 +133,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>23</pageId> + <pageId>26</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -164,8 +164,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -252,7 +252,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>2</idVisit> + <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> <actionDetails> @@ -262,7 +262,7 @@ <pageIdAction>16</pageIdAction> - <pageId>19</pageId> + <pageId>20</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <bandwidth /> @@ -282,7 +282,7 @@ <pageIdAction>16</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <bandwidth /> @@ -322,7 +322,7 @@ <pageIdAction>16</pageIdAction> - <pageId>25</pageId> + <pageId>23</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <bandwidth /> @@ -342,7 +342,7 @@ <pageIdAction /> - <pageId>26</pageId> + <pageId>24</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <bandwidth /> @@ -360,10 +360,10 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>27</pageIdAction> + <pageIdAction>26</pageIdAction> - <pageId>27</pageId> + <pageId>25</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> @@ -392,8 +392,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -480,7 +480,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>3</idVisit> + <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> <actionDetails> @@ -490,7 +490,7 @@ <pageIdAction>16</pageIdAction> - <pageId>21</pageId> + <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -517,8 +517,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1172,11 +1172,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>47</pageId> + <pageId>50</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> @@ -1203,8 +1203,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1293,11 +1293,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>46</pageId> + <pageId>49</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -1324,8 +1324,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1408,7 +1408,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>7</idVisit> + <idVisit>8</idVisit> <visitIp>111.1.1.1</visitIp> <actionDetails> @@ -1418,7 +1418,7 @@ <pageIdAction>16</pageIdAction> - <pageId>42</pageId> + <pageId>43</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <bandwidth /> @@ -1438,7 +1438,7 @@ <pageIdAction>16</pageIdAction> - <pageId>43</pageId> + <pageId>44</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <bandwidth /> @@ -1478,7 +1478,7 @@ <pageIdAction>16</pageIdAction> - <pageId>48</pageId> + <pageId>46</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <bandwidth /> @@ -1498,7 +1498,7 @@ <pageIdAction /> - <pageId>49</pageId> + <pageId>47</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <bandwidth /> @@ -1516,10 +1516,10 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>27</pageIdAction> + <pageIdAction>26</pageIdAction> - <pageId>50</pageId> + <pageId>48</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> @@ -1548,8 +1548,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1632,7 +1632,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>8</idVisit> + <idVisit>7</idVisit> <visitIp>111.1.1.1</visitIp> <actionDetails> @@ -1642,7 +1642,7 @@ <pageIdAction>16</pageIdAction> - <pageId>44</pageId> + <pageId>42</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -1669,8 +1669,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 7098adfbda..ecc87ee607 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -8,11 +8,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>70</pageId> + <pageId>73</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> @@ -39,8 +39,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -129,11 +129,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>69</pageId> + <pageId>72</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -160,8 +160,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -244,7 +244,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>12</idVisit> + <idVisit>13</idVisit> <visitIp>111.1.1.2</visitIp> <actionDetails> @@ -254,7 +254,7 @@ <pageIdAction>16</pageIdAction> - <pageId>65</pageId> + <pageId>66</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <bandwidth /> @@ -274,7 +274,7 @@ <pageIdAction>16</pageIdAction> - <pageId>66</pageId> + <pageId>67</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <bandwidth /> @@ -314,7 +314,7 @@ <pageIdAction>16</pageIdAction> - <pageId>71</pageId> + <pageId>69</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <bandwidth /> @@ -334,7 +334,7 @@ <pageIdAction /> - <pageId>72</pageId> + <pageId>70</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <bandwidth /> @@ -352,10 +352,10 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>27</pageIdAction> + <pageIdAction>26</pageIdAction> - <pageId>73</pageId> + <pageId>71</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> @@ -384,8 +384,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -468,7 +468,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>13</idVisit> + <idVisit>12</idVisit> <visitIp>111.1.1.2</visitIp> <actionDetails> @@ -478,7 +478,7 @@ <pageIdAction>16</pageIdAction> - <pageId>67</pageId> + <pageId>65</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -505,8 +505,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1021,11 +1021,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>24</pageId> + <pageId>27</pageId> <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> @@ -1052,8 +1052,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1146,11 +1146,11 @@ <actionDetails> <row> <type>event</type> - <url>http://example.org/movies</url> - <pageIdAction>16</pageIdAction> + <url>http://example.org/finishedMovie</url> + <pageIdAction>26</pageIdAction> - <pageId>23</pageId> + <pageId>26</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -1177,8 +1177,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1265,7 +1265,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>2</idVisit> + <idVisit>3</idVisit> <visitIp>156.5.3.2</visitIp> <actionDetails> @@ -1275,7 +1275,7 @@ <pageIdAction>16</pageIdAction> - <pageId>19</pageId> + <pageId>20</pageId> <eventCategory>Movie</eventCategory> <eventAction>play50%</eventAction> <bandwidth /> @@ -1295,7 +1295,7 @@ <pageIdAction>16</pageIdAction> - <pageId>20</pageId> + <pageId>21</pageId> <eventCategory>Movie</eventCategory> <eventAction>play75%</eventAction> <bandwidth /> @@ -1335,7 +1335,7 @@ <pageIdAction>16</pageIdAction> - <pageId>25</pageId> + <pageId>23</pageId> <eventCategory>Movie</eventCategory> <eventAction>playEnd</eventAction> <bandwidth /> @@ -1355,7 +1355,7 @@ <pageIdAction /> - <pageId>26</pageId> + <pageId>24</pageId> <eventCategory>Movie</eventCategory> <eventAction>rating</eventAction> <bandwidth /> @@ -1373,10 +1373,10 @@ <row> <type>event</type> <url>http://example.org/finishedMovie</url> - <pageIdAction>27</pageIdAction> + <pageIdAction>26</pageIdAction> - <pageId>27</pageId> + <pageId>25</pageId> <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> @@ -1405,8 +1405,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1493,7 +1493,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>3</idVisit> + <idVisit>2</idVisit> <visitIp>156.5.3.2</visitIp> <actionDetails> @@ -1503,7 +1503,7 @@ <pageIdAction>16</pageIdAction> - <pageId>21</pageId> + <pageId>19</pageId> <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> @@ -1530,8 +1530,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> 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 06417e5f2a..b0b23db829 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>39</nb_conversions> + <nb_conversions>40</nb_conversions> </row> <row> <label>1 day</label> @@ -54,6 +54,6 @@ </row> <row> <label>365+ days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> </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 9c34c29194..a55cc90e3d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -237,7 +237,7 @@ <visitCount>2</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>181</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>81</visitDuration> <visitDurationPretty>1 min 21s</visitDurationPretty> @@ -552,7 +552,7 @@ <visitCount>7</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>17</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>34</visitDuration> <visitDurationPretty>34s</visitDurationPretty> @@ -1002,7 +1002,7 @@ <visitCount>4</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>3</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1292,7 +1292,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>1</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1648,7 +1648,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>30</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -3627,7 +3627,7 @@ <visitCount>1</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>444</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 986f453cf9..fc239aed97 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -211,7 +211,7 @@ <visitCount>2</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>181</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>80</visitDuration> <visitDurationPretty>1 min 20s</visitDurationPretty> @@ -500,7 +500,7 @@ <visitCount>7</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>17</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>33</visitDuration> <visitDurationPretty>33s</visitDurationPretty> @@ -924,7 +924,7 @@ <visitCount>4</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>3</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1188,7 +1188,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>1</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1518,7 +1518,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>30</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1797,8 +1797,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> @@ -1934,7 +1934,7 @@ <visitCount>1</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>444</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml index 31c9d4b1b5..dcc17319f5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__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_returning>11</nb_visits_returning> + <nb_actions_returning>13</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> - <bounce_count_returning>8</bounce_count_returning> + <bounce_count_returning>9</bounce_count_returning> <sum_visit_length_returning>113</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>11</avg_time_on_site_returning> + <avg_time_on_site_returning>10</avg_time_on_site_returning> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index ab2c50f4cf..90ace52b94 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,12 +2,12 @@ <result> <row> <label>New visits</label> - <nb_visits>5</nb_visits> + <nb_visits>4</nb_visits> <segment>visitorType==new</segment> </row> <row> <label>0 days</label> - <nb_visits>3</nb_visits> + <nb_visits>4</nb_visits> <segment>daysSinceLastVisit==0</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 6c319576b3..68b2d497aa 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -303,7 +303,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 778e59292c..10f07ddf04 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -68,10 +68,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -454,7 +454,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 5c19677042..4bd684c320 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -798,10 +798,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -1184,7 +1184,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 5c19677042..4bd684c320 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -798,10 +798,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -1184,7 +1184,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 5f3ce1e11b..1f12157283 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -798,10 +798,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> @@ -1184,7 +1184,7 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> <visitDuration>0</visitDuration> <visitDurationPretty>0s</visitDurationPretty> @@ -1546,10 +1546,10 @@ <visitCount>5</visitCount> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>101</daysSinceFirstVisit> + <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index f20ee4b525..96d29e8c4d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -5,7 +5,7 @@ <nb_visits>8</nb_visits> <nb_actions>23</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>6484</sum_visit_length> + <sum_visit_length>6485</sum_visit_length> <bounce_count>4</bounce_count> <goals> <row idgoal='1'> @@ -36,7 +36,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -166,7 +166,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -199,7 +199,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -230,7 +230,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -261,7 +261,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -323,7 +323,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml index 0569de72bd..9fedfcc0e7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ <nb_visits>20</nb_visits> <nb_actions>56</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>16210</sum_visit_length> + <sum_visit_length>16214</sum_visit_length> <bounce_count>10</bounce_count> <goals> <row idgoal='1'> @@ -30,7 +30,7 @@ <nb_visits>9</nb_visits> <nb_actions>23</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>6484</sum_visit_length> + <sum_visit_length>6486</sum_visit_length> <bounce_count>5</bounce_count> <goals> <row idgoal='1'> @@ -55,7 +55,7 @@ <nb_visits>4</nb_visits> <nb_actions>10</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>3242</sum_visit_length> + <sum_visit_length>3244</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index c4558671c1..82b63f81f9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ <nb_visits>10</nb_visits> <nb_actions>28</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>8105</sum_visit_length> + <sum_visit_length>8107</sum_visit_length> <bounce_count>5</bounce_count> <goals> <row idgoal='1'> @@ -33,7 +33,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -61,7 +61,7 @@ <nb_visits>4</nb_visits> <nb_actions>11</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3242</sum_visit_length> + <sum_visit_length>3243</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -117,7 +117,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -173,7 +173,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -229,7 +229,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 2faf49e7c2..21989c4589 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ <nb_visits>8</nb_visits> <nb_actions>23</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>6484</sum_visit_length> + <sum_visit_length>6485</sum_visit_length> <bounce_count>4</bounce_count> <goals> <row idgoal='1'> @@ -34,7 +34,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -64,7 +64,7 @@ <nb_visits>6</nb_visits> <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4864</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -94,7 +94,7 @@ <nb_visits>4</nb_visits> <nb_actions>11</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3242</sum_visit_length> + <sum_visit_length>3243</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -154,7 +154,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -214,7 +214,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -244,7 +244,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml index 3281980946..cc33379e4b 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ <nb_visits>10</nb_visits> <nb_actions>28</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>8105</sum_visit_length> + <sum_visit_length>8107</sum_visit_length> <bounce_count>5</bounce_count> <goals> <row idgoal='1'> @@ -33,7 +33,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 48db8ab5db..d8bc26728d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ <nb_visits>10</nb_visits> <nb_actions>28</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>8105</sum_visit_length> + <sum_visit_length>8107</sum_visit_length> <bounce_count>5</bounce_count> <goals> <row idgoal='1'> @@ -33,7 +33,7 @@ <nb_visits>4</nb_visits> <nb_actions>11</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3242</sum_visit_length> + <sum_visit_length>3243</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -117,7 +117,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index cb1ce9b492..1d4c53af8c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml index 0fa12f42c6..f9e2d43c8a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index 5c1e0ee7b7..fc45fd1b28 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 5b6c579fd9..491375f7c4 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4865</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index 3ac9b4ac08..abd0c8000d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -38,7 +38,7 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml index e0af0dd2f0..16e1d8654a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4864</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 4b743fcad0..6720719693 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4864</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 92d58fd670..910d8e57a3 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ <nb_visits>6</nb_visits> <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> + <sum_visit_length>4864</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml index fb8bff196a..53c16b144e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml @@ -11,7 +11,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -34,7 +34,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml index 84fa59f5ba..2c76f8f5ed 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -34,7 +34,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -57,7 +57,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml index 1213b053e9..c90f6ed411 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml @@ -11,7 +11,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -34,7 +34,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml index bfa6bf7054..6b5125d418 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -31,7 +31,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -54,7 +54,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml index 22dba00ee3..2bba7ca57f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml @@ -13,7 +13,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml index cacb4e2af6..e1d4019187 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml @@ -11,7 +11,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -34,7 +34,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml index 85575f2815..0349f2d4ae 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -72,7 +72,7 @@ <max_time_generation>0.134</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_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -95,7 +95,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index 68eb0c2cb1..eade448231 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml index 5b118e92d7..25b7e8001f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserEngine==Gecko</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index fdae1ac533..3134a830bd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index dc67261f58..d46e2e94ee 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index 3c5c78e32f..a07764bd2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml index cf25822455..cc79e1c556 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index e97badfc7a..6a02ad5741 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 24cf680d07..3a614ec88e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 80be0570eb..994ae6f780 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml index 71fa45b399..d4a8ca8cd4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml @@ -6,7 +6,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml index 58e9ba46bb..4ffc46cba8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml @@ -6,7 +6,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -25,7 +25,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index fd2de07373..54375ecc6b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -6,7 +6,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -25,7 +25,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml index 822ff82c39..f8ff217d23 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -6,7 +6,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -27,7 +27,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml index 318d2a3375..853619166e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml index 28af23e62d..0cebc949c9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>resolution==1024x768</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index c0135236f8..3de8b0ec74 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml index 280b7fd6fc..b844d3722c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 9a80fd221e..4f2064602f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index be4c941999..516b5894cc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml index 6fb957f0f4..93b6d80e40 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>languageCode==fr</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml index bab68538ab..dc685f6a60 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml @@ -6,7 +6,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>languageCode==fr,languageCode=@fr-</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml index eb4e37fdf7..d54302bd2e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml @@ -5,9 +5,9 @@ <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> + <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_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml index e715309206..2f80dd12d8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml @@ -30,7 +30,7 @@ <nb_visits>2</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>8</nb_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <day_of_week>6</day_of_week> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml index a35c24e46c..bb6af8f12e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -138,7 +138,7 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>visitLocalHour==12</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index 3a3139f24d..ebfe22b595 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -146,7 +146,7 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml index c7ce53bdef..92d0dcada9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27 min 1s</result>
\ No newline at end of file +<result>27 min 2s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml index f7692644ac..46e68040e9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>1621</result>
\ No newline at end of file +<result>1622</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml index 40498bf45d..25d4229e22 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml @@ -5,7 +5,7 @@ <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>7</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index d071ca0636..4d1d70dd2b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -74,7 +74,7 @@ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>1621</entry_sum_visit_length> + <entry_sum_visit_length>1622</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> </reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json index d83bc11f18..fd1dd5f53a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json @@ -1 +1 @@ -[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11-30s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31-60s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}]]
\ No newline at end of file +[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11-30s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31-60s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}]]
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml index 5dec81a951..fae1cfbd60 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml @@ -8,7 +8,7 @@ <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>7</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> @@ -25,7 +25,7 @@ <nb_actions>8</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>7</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv Binary files differindex 2ff47c1417..334234d98c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index 1114c6bf1c..8e97cd40bc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -79,7 +79,7 @@ <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>1621</entry_sum_visit_length> + <entry_sum_visit_length>1622</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> <nb_uniq_visitors>3</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml index 6a4f62e811..057c97be8b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml @@ -14,7 +14,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -40,7 +40,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml index 3edb37d4ef..2efebb9d83 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml @@ -40,7 +40,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -66,7 +66,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml index 3a3385fde5..a7e541a516 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml @@ -14,7 +14,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -40,7 +40,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml index e03b772704..25f48ca674 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml @@ -38,7 +38,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -64,7 +64,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml index 1052f04a28..cace1f2640 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml @@ -16,7 +16,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml index b786ac89d0..e536f2a0e4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml @@ -14,7 +14,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -40,7 +40,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml index 0dd1d7bc96..a580726e42 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml @@ -85,7 +85,7 @@ <max_bandwidth /> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> @@ -111,7 +111,7 @@ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>1</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index 8c9d60e701..3eb73dbae5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml index 14c3dc0d52..a35b1c484c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserEngine==Gecko</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index 70be909782..37b45aa307 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 741d8d0537..ff8eae17fe 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 743078e026..ce0cfc0c05 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml index 4cbaeef256..eeeeec726a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 55011bb7df..5683c4ef19 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index c80d98672c..d57f0c947d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index fc8095c42a..f8ec1d8996 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 48ec7c911b..8432da89a8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -62,8 +62,8 @@ <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitDuration>1</visitDuration> + <visitDurationPretty>1s</visitDurationPretty> <searches>0</searches> <actions>1</actions> <interactions>1</interactions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index 1a2fcfb278..b529af5997 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -7,7 +7,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml index 0776d8038e..c8e175d51e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml @@ -7,7 +7,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -27,7 +27,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index e4b6ce2e00..85a5c52e65 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -7,7 +7,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -27,7 +27,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index db56768738..17eb6ecefb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -7,7 +7,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> @@ -29,7 +29,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 7a36771e5e..a9cfb95556 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml index dd647ae66e..0f2eb2dc82 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index 45bb6b9f18..dab87109ed 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index d1663e0ee4..6dd3ae3aa4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -7,7 +7,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml index 3633fe5914..8cddd44053 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml @@ -6,9 +6,9 @@ <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> + <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_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml index 16a8a552ba..3f6963bc4a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml @@ -31,7 +31,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_actions>9</nb_actions> <nb_users>0</nb_users> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <day_of_week>6</day_of_week> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index dfc1858282..336aedbb82 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -151,7 +151,7 @@ <nb_actions>9</nb_actions> <nb_users>0</nb_users> <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>visitLocalHour==12</segment> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index d1041d2631..0a4a3ac8bb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -159,7 +159,7 @@ <nb_actions>1</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> + <sum_visit_length>1</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='2'> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml index c7ce53bdef..92d0dcada9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27 min 1s</result>
\ No newline at end of file +<result>27 min 2s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml index f7692644ac..46e68040e9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>1621</result>
\ No newline at end of file +<result>1622</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml index 9f63db28ef..3166abe193 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml @@ -6,7 +6,7 @@ <nb_actions>9</nb_actions> <nb_visits_converted>2</nb_visits_converted> <bounce_count>1</bounce_count> - <sum_visit_length>1621</sum_visit_length> + <sum_visit_length>1622</sum_visit_length> <max_actions>8</max_actions> <bounce_rate>50%</bounce_rate> <nb_actions_per_visit>4.5</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index c4e0e6f502..f506073cc8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -38,8 +38,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml index 97ab84ae2f..a3a0d914f6 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml @@ -109,12 +109,12 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -186,12 +186,12 @@ </row> <row> <label>2 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> <label>3 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -263,12 +263,12 @@ </row> <row> <label>3 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -340,12 +340,12 @@ </row> <row> <label>4 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> <revenue>$ 0</revenue> </row> <row> <label>5 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -417,12 +417,12 @@ </row> <row> <label>5 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> <revenue>$ 0</revenue> </row> <row> <label>6 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> <revenue>$ 0</revenue> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml index c12a5b867e..2401b3cdce 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml @@ -67,11 +67,11 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> @@ -129,11 +129,11 @@ </row> <row> <label>2 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>4 days</label> @@ -191,11 +191,11 @@ </row> <row> <label>3 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>5 days</label> @@ -253,11 +253,11 @@ </row> <row> <label>4 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>6 days</label> @@ -315,11 +315,11 @@ </row> <row> <label>5 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>6 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>7 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml index 79e8e68078..cf112fa670 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml @@ -8,7 +8,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -20,7 +20,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -36,7 +36,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml index 1c68c1e0fb..05c2f167be 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml @@ -66,7 +66,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -78,7 +78,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -90,7 +90,7 @@ </row> <row> <label>7 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>8-14 days</label> @@ -148,11 +148,11 @@ </row> <row> <label>7 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml index 722b21fb93..6e34ed3638 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml @@ -8,7 +8,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -20,7 +20,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -36,7 +36,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml index 4bd8b6ee02..a5ea4f4326 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml @@ -66,11 +66,11 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>3 days</label> @@ -128,11 +128,11 @@ </row> <row> <label>2 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>4 days</label> @@ -190,11 +190,11 @@ </row> <row> <label>3 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>5 days</label> @@ -252,11 +252,11 @@ </row> <row> <label>4 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>6 days</label> @@ -314,11 +314,11 @@ </row> <row> <label>5 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>6 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>7 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml index 0ca4a8164c..49b21175e9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml @@ -7,7 +7,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -19,7 +19,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -35,7 +35,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml index c7fca7df71..4cdb238c93 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml @@ -65,7 +65,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -77,7 +77,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -89,7 +89,7 @@ </row> <row> <label>7 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>0</nb_conversions> </row> <row> <label>8-14 days</label> @@ -147,11 +147,11 @@ </row> <row> <label>7 days</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml index 0d681eaadd..f07d1e4c63 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml @@ -7,7 +7,7 @@ </row> <row> <label>1 day</label> - <nb_conversions>0</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>2 days</label> @@ -19,7 +19,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>1</nb_conversions> </row> <row> <label>5 days</label> @@ -35,7 +35,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>3</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml index c61ad5dc70..01fd8ff974 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml @@ -4,12 +4,12 @@ <nb_visits_converted>1</nb_visits_converted> <revenue>0</revenue> <conversion_rate>50%</conversion_rate> - <nb_conversions_new_visit>1</nb_conversions_new_visit> - <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit> + <nb_conversions_new_visit>0</nb_conversions_new_visit> + <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit> <revenue_new_visit>0</revenue_new_visit> - <conversion_rate_new_visit>50%</conversion_rate_new_visit> - <nb_conversions_returning_visit>0</nb_conversions_returning_visit> - <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> + <conversion_rate_new_visit>0%</conversion_rate_new_visit> + <nb_conversions_returning_visit>1</nb_conversions_returning_visit> + <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> - <conversion_rate_returning_visit>0%</conversion_rate_returning_visit> + <conversion_rate_returning_visit>100%</conversion_rate_returning_visit> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 48b3245b43..d72489946a 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml index 2c07daa5b1..1119251100 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml @@ -7,7 +7,7 @@ <nb_conversions_new_visit>3</nb_conversions_new_visit> <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> <revenue_new_visit>1000</revenue_new_visit> - <conversion_rate_new_visit>66.67%</conversion_rate_new_visit> + <conversion_rate_new_visit>100%</conversion_rate_new_visit> <nb_conversions_returning_visit>0</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 73505be9bc..7bd2d55282 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -29,8 +29,8 @@ <siteName>Piwik test</siteName> <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 73505be9bc..7bd2d55282 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -29,8 +29,8 @@ <siteName>Piwik test</siteName> <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 1d630481ed..831a453214 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -62,8 +62,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml index 2c07daa5b1..1119251100 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml @@ -7,7 +7,7 @@ <nb_conversions_new_visit>3</nb_conversions_new_visit> <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit> <revenue_new_visit>1000</revenue_new_visit> - <conversion_rate_new_visit>66.67%</conversion_rate_new_visit> + <conversion_rate_new_visit>100%</conversion_rate_new_visit> <nb_conversions_returning_visit>0</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit> <revenue_returning_visit>0</revenue_returning_visit> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 73505be9bc..7bd2d55282 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -29,8 +29,8 @@ <siteName>Piwik test</siteName> <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 73505be9bc..7bd2d55282 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -29,8 +29,8 @@ <siteName>Piwik test</siteName> <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 1d630481ed..831a453214 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -62,8 +62,8 @@ <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php index a5554eff07..38494a420f 100644 --- a/tests/PHPUnit/Unit/Tracker/RequestTest.php +++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php @@ -162,7 +162,7 @@ class RequestTest extends UnitTestCase { $request = $this->buildRequest(array('_idts' => '' . ($this->time - 43200))); $request->setIsAuthenticated(); - $this->assertEquals(1.0, $request->getDaysSinceFirstVisit()); + $this->assertEquals(0.0, $request->getDaysSinceFirstVisit()); } public function test_getDaysSinceFirstVisit_Yesterday() diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 418ca12bd5..3b34ac3004 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85f5c529c045728879f1681c383154136f8bb32bfc5e79ffcd88fce4920411a8 -size 4234964 +oid sha256:9f717f3cfd19c8f2167ca973f21c5026073b2b6750f0612e639c8269c1b1170d +size 4246372 |
