From 30f06e28d6ff1a1d366f598f657fb8484a9ae062 Mon Sep 17 00:00:00 2001 From: Timo Besenreuther <timo.besenreuther@gmail.com> Date: Wed, 3 Apr 2013 17:59:52 +0200 Subject: [PATCH] refs #1700: new metrics min_time_generation, max_time_generation * DataTable_Row::sumRow has a new parameter $aggregationOperations which allows treating columns as min or max (not only sum) * The aggregation operations can be set on any data table or passed to ArchiveProcessing_Period::archiveDataTable() * The Actions plugin uses the mechanism to aggregate the new metrics as min and max * The metrics are in the API output but not in processed reports * The min/max values are shown in the tooltip that appears when hovering the average generation times * Integration test updates --- core/Archive.php | 4 ++ core/ArchiveProcessing/Period.php | 16 +++++-- core/DataTable.php | 43 +++++++++++++++++- .../Filter/ColumnCallbackAddMetadata.php | 13 ++++-- core/DataTable/Row.php | 36 ++++++++++++--- core/DataTable/Row/DataTableSummary.php | 2 +- core/Piwik.php | 4 +- lang/en.php | 2 +- plugins/Actions/API.php | 10 +++- plugins/Actions/Archiving.php | 37 +++++++++++++-- plugins/Actions/ArchivingHelper.php | 21 ++++++++- plugins/Actions/Controller.php | 13 +++++- .../TwoSitesTwoVisitorsDifferentDays.php | 5 ++ ...lattenReports__Actions.getPageUrls_day.xml | 18 ++++++++ ...ndedSubtable__Actions.getPageUrls_week.xml | 10 ++++ ...ernRecursive__Actions.getPageUrls_week.xml | 6 +++ ...withAggregate__Actions.getPageUrls_day.xml | 36 +++++++++++++++ ...st_ImportLogs__Actions.getPageUrls_day.xml | 22 +++++++++ ...LabelFilter_0__Actions.getPageUrls_day.xml | 2 + ...r2sub0filephp__Actions.getPageUrls_day.xml | 2 + ...belFilter_dir__Actions.getPageUrls_day.xml | 2 + ...ter_dir_range__Actions.getPageUrls_day.xml | 2 + ...foobarfoo2bar__Actions.getPageUrls_day.xml | 2 + ...er_thisiscool__Actions.getPageUrls_day.xml | 2 + ...esRecursive__Actions.getPageTitles_day.xml | 2 + ...lter_titles__Actions.getPageTitles_day.xml | 2 + ...Visits__Actions.getEntryPageTitles_day.xml | 6 +++ ...woVisits__Actions.getEntryPageUrls_day.xml | 6 +++ ...oVisits__Actions.getExitPageTitles_day.xml | 6 +++ ...TwoVisits__Actions.getExitPageUrls_day.xml | 6 +++ ...torTwoVisits__Actions.getPageTitle_day.xml | 2 + ...orTwoVisits__Actions.getPageTitles_day.xml | 10 ++++ ...sitorTwoVisits__Actions.getPageUrl_day.xml | 2 + ...itorTwoVisits__Actions.getPageUrls_day.xml | 10 ++++ ...ideColumns___Actions.getPageTitles_day.xml | 10 ++++ ...upport__Actions.getEntryPageTitles_day.xml | 6 +++ ...eSupport__Actions.getEntryPageUrls_day.xml | 6 +++ ...Support__Actions.getExitPageTitles_day.xml | 6 +++ ...ieSupport__Actions.getExitPageUrls_day.xml | 6 +++ ...ookieSupport__Actions.getPageTitle_day.xml | 2 + ...s.getPageTitlesFollowingSiteSearch_day.xml | 2 + ...okieSupport__Actions.getPageTitles_day.xml | 10 ++++ ...hCookieSupport__Actions.getPageUrl_day.xml | 2 + ...ons.getPageUrlsFollowingSiteSearch_day.xml | 2 + ...CookieSupport__Actions.getPageUrls_day.xml | 10 ++++ ...disabledAfter__VisitsSummary.get_month.xml | 10 ++-- ..._disabledAfter__VisitsSummary.get_year.xml | 10 ++-- ...abled_enabled__VisitsSummary.get_month.xml | 10 ++-- ...sabled_enabled__VisitsSummary.get_year.xml | 10 ++-- ...Site_lastN__API.getProcessedReport_day.xml | 4 +- ...tLastNPeriods__VisitsSummary.get_month.xml | 10 ++-- ...ays_Conversions__MultiSites.getAll_day.xml | 4 +- ...s_Conversions__MultiSites.getAll_month.xml | 4 +- ...ys_Conversions__MultiSites.getAll_week.xml | 4 +- ...ys_Conversions__MultiSites.getAll_year.xml | 4 +- ...ions_idSiteOne___MultiSites.getAll_day.xml | 4 +- ...ns_idSiteOne___MultiSites.getAll_month.xml | 4 +- ...ons_idSiteOne___MultiSites.getAll_week.xml | 4 +- ...ons_idSiteOne___MultiSites.getAll_year.xml | 4 +- ...tLastNPeriods__VisitsSummary.get_month.xml | 6 +-- ...ifferentDays__Actions.getPageTitle_day.xml | 2 + ...ferentDays__Actions.getPageTitle_month.xml | 2 + ...fferentDays__Actions.getPageTitle_week.xml | 2 + ...fferentDays__Actions.getPageTitle_year.xml | 2 + ...fferentDays__Actions.getPageTitles_day.xml | 28 ++++++++++-- ...erentDays__Actions.getPageTitles_month.xml | 28 ++++++++++-- ...ferentDays__Actions.getPageTitles_week.xml | 28 ++++++++++-- ...ferentDays__Actions.getPageTitles_year.xml | 28 ++++++++++-- ...differentDays__Actions.getPageUrls_day.xml | 32 ++++++++++--- ...fferentDays__Actions.getPageUrls_month.xml | 28 +++++++++--- ...ifferentDays__Actions.getPageUrls_week.xml | 30 +++++++++--- ...ifferentDays__Actions.getPageUrls_year.xml | 28 +++++++++--- ...ifferentDays__Referers.getWebsites_day.xml | 8 ++-- ...ferentDays__Referers.getWebsites_month.xml | 8 ++-- ...fferentDays__Referers.getWebsites_week.xml | 8 ++-- ...fferentDays__Referers.getWebsites_year.xml | 8 ++-- ...s_differentDays__VisitsSummary.get_day.xml | 6 +-- ...differentDays__VisitsSummary.get_month.xml | 6 +-- ..._differentDays__VisitsSummary.get_week.xml | 6 +-- ..._differentDays__VisitsSummary.get_year.xml | 6 +-- ...s_idSiteOne___Actions.getPageTitle_day.xml | 2 + ...idSiteOne___Actions.getPageTitle_month.xml | 2 + ..._idSiteOne___Actions.getPageTitle_week.xml | 2 + ..._idSiteOne___Actions.getPageTitle_year.xml | 2 + ..._idSiteOne___Actions.getPageTitles_day.xml | 16 +++++++ ...dSiteOne___Actions.getPageTitles_month.xml | 16 +++++++ ...idSiteOne___Actions.getPageTitles_week.xml | 16 +++++++ ...idSiteOne___Actions.getPageTitles_year.xml | 16 +++++++ ...ays_idSiteOne___Actions.getPageUrl_day.xml | 4 ++ ...s_idSiteOne___Actions.getPageUrl_month.xml | 2 + ...ys_idSiteOne___Actions.getPageUrl_week.xml | 4 ++ ...ys_idSiteOne___Actions.getPageUrl_year.xml | 2 + ...ys_idSiteOne___Actions.getPageUrls_day.xml | 12 +++++ ..._idSiteOne___Actions.getPageUrls_month.xml | 8 ++++ ...s_idSiteOne___Actions.getPageUrls_week.xml | 10 ++++ ...s_idSiteOne___Actions.getPageUrls_year.xml | 8 ++++ ...Reports.generateReport_month.original.html | 4 +- ...FReports.generateReport_month.original.pdf | Bin 466586 -> 466576 bytes ...orts.generateReport_month.original.sms.txt | 2 +- ...DFReports.generateReport_week.original.pdf | Bin 486749 -> 486745 bytes 100 files changed, 789 insertions(+), 149 deletions(-) diff --git a/core/Archive.php b/core/Archive.php index 598247cbe1..5492c1b4a8 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -81,6 +81,8 @@ abstract class Piwik_Archive // Performance Analytics const INDEX_PAGE_SUM_TIME_GENERATION = 30; const INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION = 31; + const INDEX_PAGE_MIN_TIME_GENERATION = 32; + const INDEX_PAGE_MAX_TIME_GENERATION = 33; // Goal reports const INDEX_GOAL_NB_CONVERSIONS = 1; @@ -111,6 +113,8 @@ abstract class Piwik_Archive Piwik_Archive::INDEX_PAGE_SUM_TIME_SPENT => 'sum_time_spent', Piwik_Archive::INDEX_PAGE_SUM_TIME_GENERATION => 'sum_time_generation', Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION => 'nb_hits_with_time_generation', + Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION => 'min_time_generation', + Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION => 'max_time_generation', Piwik_Archive::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS => 'exit_nb_uniq_visitors', Piwik_Archive::INDEX_PAGE_EXIT_NB_VISITS => 'exit_nb_visits', diff --git a/core/ArchiveProcessing/Period.php b/core/ArchiveProcessing/Period.php index 0ca9ce171b..6d3de2e6f6 100644 --- a/core/ArchiveProcessing/Period.php +++ b/core/ArchiveProcessing/Period.php @@ -148,7 +148,8 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing * (eg. unique visitors go from nb_uniq_visitors to sum_daily_nb_uniq_visitors) * @param int $maximumRowsInDataTableLevelZero Max row count of parent datatable to archive * @param int $maximumRowsInSubDataTable Max row count of children datatable(s) to archive - * @param string $columnToSortByBeforeTruncation Column name to sort by, before truncating rows (ie. if there are more rows than the specified max row count) + * @param string $columnToSortByBeforeTruncation Column name to sort by, before truncating rows (ie. if there are more rows than the specified max row count) + * @param array $columnAggregationOperations Operations for aggregating columns, @see Piwik_DataTable_Row::sumRow() * * @return array array ( * nameTable1 => number of rows, @@ -159,7 +160,8 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing $invalidSummedColumnNameToRenamedName = null, $maximumRowsInDataTableLevelZero = null, $maximumRowsInSubDataTable = null, - $columnToSortByBeforeTruncation = null) + $columnToSortByBeforeTruncation = null, + &$columnAggregationOperations = null) { // We clean up below all tables created during this function call (and recursive calls) $latestUsedTableId = Piwik_DataTable_Manager::getInstance()->getMostRecentTableId(); @@ -171,7 +173,7 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing $nameToCount = array(); foreach ($aRecordName as $recordName) { - $table = $this->getRecordDataTableSum($recordName, $invalidSummedColumnNameToRenamedName); + $table = $this->getRecordDataTableSum($recordName, $invalidSummedColumnNameToRenamedName, $columnAggregationOperations); $nameToCount[$recordName]['level0'] = $table->getRowsCount(); $nameToCount[$recordName]['recursive'] = $table->getRowsCountRecursive(); @@ -192,11 +194,17 @@ class Piwik_ArchiveProcessing_Period extends Piwik_ArchiveProcessing * * @param string $name * @param array $invalidSummedColumnNameToRenamedName columns in the array (old name, new name) to be renamed as the sum operation is not valid on them (eg. nb_uniq_visitors->sum_daily_nb_uniq_visitors) + * @param array $columnAggregationOperations Operations for aggregating columns, @see Piwik_DataTable_Row::sumRow() * @return Piwik_DataTable */ - protected function getRecordDataTableSum($name, $invalidSummedColumnNameToRenamedName) + protected function getRecordDataTableSum($name, $invalidSummedColumnNameToRenamedName, &$columnAggregationOperations = null) { $table = new Piwik_DataTable(); + + if (is_array($columnAggregationOperations)) { + $table->setColumnAggregationOperations($columnAggregationOperations); + } + foreach ($this->archives as $archive) { $archive->preFetchBlob($name); $datatableToSum = $archive->getDataTable($name); diff --git a/core/DataTable.php b/core/DataTable.php index 98086d9f17..b39d7644dc 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -254,6 +254,12 @@ class Piwik_DataTable */ protected $maximumAllowedRows = 0; + /** + * The operations that should be used when aggregating columns from multiple rows. + * @see self::addDataTable() and Piwik_DataTable_Row::sumRow() + */ + protected $columnAggregationOperations = array(); + const ID_SUMMARY_ROW = -1; const LABEL_SUMMARY_ROW = -1; const ID_PARENTS = -2; @@ -436,7 +442,7 @@ class Piwik_DataTable $this->addRow($row); } } else { - $rowFound->sumRow($row); + $rowFound->sumRow($row, $copyMeta = true, $this->columnAggregationOperations); // if the row to add has a subtable whereas the current row doesn't // we simply add it (cloning the subtable) @@ -1348,6 +1354,7 @@ class Piwik_DataTable { $table = new Piwik_DataTable(); $table->setMaximumAllowedRows($maxSubtableRows); + $table->setColumnAggregationOperations($this->columnAggregationOperations); $next->setSubtable($table); // Summary row, has no metadata $next->deleteMetadata(); @@ -1388,7 +1395,7 @@ class Piwik_DataTable if ($existing === false) { $result->addSummaryRow($copy); } else { - $existing->sumRow($copy); + $existing->sumRow($copy, $copyMeta = true, $this->columnAggregationOperations); } } else { if ($labelColumn !== false) { @@ -1428,4 +1435,36 @@ class Piwik_DataTable $dataTable->addRowsFromSimpleArray($array); return $dataTable; } + + /** + * Set the aggregation operation for a column, e.g. "min". + * @see self::addDataTable() and Piwik_DataTable_Row::sumRow() + * + * @param string $columnName + * @param string $operation + */ + public function setColumnAggregationOperation($columnName, $operation) + { + $this->columnAggregationOperations[$columnName] = $operation; + } + + /** + * Set multiple aggregation operations at once. + * @param array $operations format: column name => operation + */ + public function setColumnAggregationOperations($operations) + { + foreach ($operations as $columnName => $operation) { + $this->setColumnAggregationOperation($columnName, $operation); + } + } + + /** + * Get the configured column aggregation operations + */ + public function getColumnAggregationOperations() + { + return $this->columnAggregationOperations; + } + } diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php index 2ce2ad19dc..5f8c0bc8fe 100644 --- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php +++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php @@ -58,15 +58,22 @@ class Piwik_DataTable_Filter_ColumnCallbackAddMetadata extends Piwik_DataTable_F continue; } - $oldValue = $row->getColumn($this->columnToRead); - $parameters = array($oldValue); + if (is_array($this->columnToRead)) { + $parameters = array(); + foreach ($this->columnToRead as $columnToRead) { + $parameters[] = $row->getColumn($columnToRead); + } + } else { + $oldValue = $row->getColumn($this->columnToRead); + $parameters = array($oldValue); + } if (!is_null($this->functionParameters)) { $parameters = array_merge($parameters, $this->functionParameters); } if (!is_null($this->functionToApply)) { $newValue = call_user_func_array($this->functionToApply, $parameters); } else { - $newValue = $oldValue; + $newValue = $parameters[0]; } if ($newValue !== false) { $row->addMetadata($this->metadataToAdd, $newValue); diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 63263d61ca..05ade719cd 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -171,7 +171,7 @@ class Piwik_DataTable_Row */ public function deleteColumn($name) { - if (!isset($this->c[self::COLUMNS][$name])) { + if (!array_key_exists($name, $this->c[self::COLUMNS])) { return false; } unset($this->c[self::COLUMNS][$name]); @@ -455,21 +455,45 @@ class Piwik_DataTable_Row * this.columns[idThisCol] += $row.columns[idThisCol] * * @param Piwik_DataTable_Row $rowToSum + * @param array $aggregationOperations for columns that should not be summed, determine which + * aggregation should be used (min, max). + * format: column name => function name * @param bool $enableCopyMetadata */ - public function sumRow(Piwik_DataTable_Row $rowToSum, $enableCopyMetadata = true) + public function sumRow(Piwik_DataTable_Row $rowToSum, $enableCopyMetadata = true, &$aggregationOperations = null) { foreach ($rowToSum->getColumns() as $columnToSumName => $columnToSumValue) { if (!isset(self::$unsummableColumns[$columnToSumName])) // make sure we can add this column { $thisColumnValue = $this->getColumn($columnToSumName); - // Max operation + $operation = (is_array($aggregationOperations) && isset($aggregationOperations[$columnToSumName]) ? + strtolower($aggregationOperations[$columnToSumName]) : 'sum'); + + // max_actions is a core metric that is generated in ArchiveProcess_Day. Therefore, it can be + // present in any data table and is not part of the $aggregationOperations mechanism. if ($columnToSumName == Piwik_Archive::INDEX_MAX_ACTIONS) { - $newValue = max($thisColumnValue, $columnToSumValue); - } else { - $newValue = $this->sumRowArray($thisColumnValue, $columnToSumValue); + $operation = 'max'; + } + + switch ($operation) { + case 'max': + $newValue = max($thisColumnValue, $columnToSumValue); + break; + case 'min': + if (!$thisColumnValue) { + $newValue = $columnToSumValue; + } else if (!$columnToSumValue) { + $newValue = $thisColumnValue; + } else { + $newValue = min($thisColumnValue, $columnToSumValue); + } + break; + default: + $newValue = $this->sumRowArray($thisColumnValue, $columnToSumValue); + break; } + $this->setColumn($columnToSumName, $newValue); } } diff --git a/core/DataTable/Row/DataTableSummary.php b/core/DataTable/Row/DataTableSummary.php index f0ad234d54..c3acafdc66 100644 --- a/core/DataTable/Row/DataTableSummary.php +++ b/core/DataTable/Row/DataTableSummary.php @@ -54,7 +54,7 @@ class Piwik_DataTable_Row_DataTableSummary extends Piwik_DataTable_Row private function sumTable($table) { foreach ($table->getRows() as $row) { - $this->sumRow($row, $enableCopyMetadata = false); + $this->sumRow($row, $enableCopyMetadata = false, $table->getColumnAggregationOperations()); } } } diff --git a/core/Piwik.php b/core/Piwik.php index b85597e291..2f4f75b1da 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -1318,8 +1318,8 @@ class Piwik { // Display time in human readable if (strpos($columnName, 'time') !== false) { - // Little hack: Display 15s rather than 00:00:15, only for "avg_generation_time" - $timeAsSentence = ($columnName == 'avg_time_generation'); + // Little hack: Display 15s rather than 00:00:15, only for "(avg|min|max)_generation_time" + $timeAsSentence = (substr($columnName, -16) == '_time_generation'); return Piwik::getPrettyTimeFromSeconds($value, $timeAsSentence); } // Add revenue symbol to revenues diff --git a/lang/en.php b/lang/en.php index 4e086d28c2..e79bcb1c6a 100644 --- a/lang/en.php +++ b/lang/en.php @@ -438,7 +438,7 @@ $translations = array( 'Actions_SiteSearchCategories2' => 'For example, Ecommerce websites typically have a "Category" selector so that visitors can restrict their searches to all products in a specific Category.', 'Actions_SiteSearchKeywordsNoResultDocumentation' => 'This report lists the Search Keywords that did not return any Search result: maybe the search engine algorithm can be improved, or maybe your visitors are looking for content that is not (yet) on your website?', 'Actions_SiteSearchFollowingPagesDoc' => 'When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.', - 'Actions_AvgGenerationTimeTooltip' => 'Average based on %s hit(s)', + 'Actions_AvgGenerationTimeTooltip' => 'Average based on %s hit(s) %s between %s and %s', 'AnonymizeIP_PluginDescription' => 'Anonymize the last byte(s) of visitors IP addresses to comply with your local privacy laws/guidelines.', 'API_PluginDescription' => 'All the data in Piwik is available through simple APIs. This plugin is the web service entry point, that you can call to get your Web Analytics data in xml, json, php, csv, etc.', 'API_QuickDocumentationTitle' => 'API quick documentation', diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index ad9d15e73e..33cb200b32 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -505,7 +505,13 @@ class Piwik_Actions_API } else { // No generation time: remove it from the API output and add it to empty_columns metadata, so that // the columns can also be removed from the view - $dataTable->filter('ColumnDelete', array(array(Piwik_Archive::INDEX_PAGE_SUM_TIME_GENERATION, Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION))); + $dataTable->filter('ColumnDelete', array(array( + Piwik_Archive::INDEX_PAGE_SUM_TIME_GENERATION, + Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, + Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION, + Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION + ))); + if ($dataTable instanceof Piwik_DataTable) { $emptyColumns = $dataTable->getMetadata(Piwik_DataTable::EMPTY_COLUMNS_METADATA_NAME); if (!is_array($emptyColumns)) { @@ -513,6 +519,8 @@ class Piwik_Actions_API } $emptyColumns[] = 'sum_time_generation'; $emptyColumns[] = 'avg_time_generation'; + $emptyColumns[] = 'min_time_generation'; + $emptyColumns[] = 'max_time_generation'; $dataTable->setMetadata(Piwik_DataTable::EMPTY_COLUMNS_METADATA_NAME, $emptyColumns); } } diff --git a/plugins/Actions/Archiving.php b/plugins/Actions/Archiving.php index 848b4cc562..3abe7a45f0 100644 --- a/plugins/Actions/Archiving.php +++ b/plugins/Actions/Archiving.php @@ -25,6 +25,11 @@ class Piwik_Actions_Archiving Piwik_Tracker_Action::TYPE_ACTION_NAME, Piwik_Tracker_Action::TYPE_SITE_SEARCH, ); + + private static $actionColumnAggregationOperations = array( + Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION => 'max', + Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION => 'min' + ); static protected $invalidSummedColumnNameToRenamedNameFromPeriodArchive = array( Piwik_Archive::INDEX_NB_UNIQ_VISITORS => Piwik_Archive::INDEX_SUM_DAILY_NB_UNIQ_VISITORS, @@ -47,17 +52,26 @@ class Piwik_Actions_Archiving /** * Archives Actions reports for a Period - * @param Piwik_ArchiveProcessing $archiveProcessing + * @param Piwik_ArchiveProcessing_Period $archiveProcessing * @return bool */ - public function archivePeriod(Piwik_ArchiveProcessing $archiveProcessing) + public function archivePeriod(Piwik_ArchiveProcessing_Period $archiveProcessing) { Piwik_Actions_ArchivingHelper::reloadConfig(); $dataTableToSum = array( 'Actions_actions', + 'Actions_actions_url', + ); + $archiveProcessing->archiveDataTable($dataTableToSum, + self::$invalidSummedColumnNameToRenamedNameFromPeriodArchive, + Piwik_Actions_ArchivingHelper::$maximumRowsInDataTableLevelZero, + Piwik_Actions_ArchivingHelper::$maximumRowsInSubDataTable, + Piwik_Actions_ArchivingHelper::$columnToSortByBeforeTruncation, + self::$actionColumnAggregationOperations); + + $dataTableToSum = array( 'Actions_downloads', 'Actions_outlink', - 'Actions_actions_url', 'Actions_sitesearch', ); $nameToCount = $archiveProcessing->archiveDataTable($dataTableToSum, @@ -65,7 +79,7 @@ class Piwik_Actions_Archiving Piwik_Actions_ArchivingHelper::$maximumRowsInDataTableLevelZero, Piwik_Actions_ArchivingHelper::$maximumRowsInSubDataTable, Piwik_Actions_ArchivingHelper::$columnToSortByBeforeTruncation); - + $archiveProcessing->archiveNumericValuesSum(array( 'Actions_nb_pageviews', 'Actions_nb_uniq_pageviews', @@ -129,7 +143,12 @@ class Piwik_Actions_Archiving then 0 else 1 end - ) as `" . Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION . "`"; + ) as `" . Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION . "`, + min(" . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . ") / 1000 + as `" . Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION . "`, + max(" . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . ") / 1000 + as `" . Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION . "` + "; $from = array( "log_link_visit_action", @@ -160,6 +179,8 @@ class Piwik_Actions_Archiving } $rankingQuery->addColumn(Piwik_Archive::INDEX_PAGE_SUM_TIME_GENERATION, 'sum'); $rankingQuery->addColumn(Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, 'sum'); + $rankingQuery->addColumn(Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION, 'min'); + $rankingQuery->addColumn(Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION, 'max'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); } @@ -531,6 +552,12 @@ class Piwik_Actions_Archiving $dataTable = new Piwik_DataTable(); $dataTable->setMaximumAllowedRows(Piwik_Actions_ArchivingHelper::$maximumRowsInDataTableLevelZero); + if ($type == Piwik_Tracker_Action::TYPE_ACTION_URL + || $type == Piwik_Tracker_Action::TYPE_ACTION_NAME) { + // for page urls and page titles, performance metrics exist and have to be aggregated correctly + $dataTable->setColumnAggregationOperations(self::$actionColumnAggregationOperations); + } + $this->actionsTablesByType[$type] = $dataTable; } } diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 739e8a2fef..f38391fe52 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -120,6 +120,12 @@ class Piwik_Actions_ArchivingHelper if (array_key_exists(Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, $row)) { unset($row[Piwik_Archive::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION]); } + if (array_key_exists(Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION, $row)) { + unset($row[Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION]); + } + if (array_key_exists(Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION, $row)) { + unset($row[Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION]); + } } unset($row['name']); @@ -132,7 +138,20 @@ class Piwik_Actions_ArchivingHelper // - this happens when 2 visitors visit the same new page at the same time, and 2 actions get recorded for the same name // - this could also happen when 2 URLs end up having the same label (eg. 2 subdomains get aggregated to the "/index" page name) if (($alreadyValue = $actionRow->getColumn($name)) !== false) { - $actionRow->setColumn($name, $alreadyValue + $value); + if ($name == Piwik_Archive::INDEX_PAGE_MIN_TIME_GENERATION) { + if (empty($alreadyValue)) { + $newValue = $value; + } else if (empty($value)) { + $newValue = $alreadyValue; + } else { + $newValue = min($alreadyValue, $value); + } + } else if ($name == Piwik_Archive::INDEX_PAGE_MAX_TIME_GENERATION) { + $newValue = max($alreadyValue, $value); + } else { + $newValue = $alreadyValue + $value; + } + $actionRow->setColumn($name, $newValue); } else { $actionRow->addColumn($name, $value); } diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index 1744a63155..4fc2f0aad3 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -391,8 +391,17 @@ class Piwik_Actions_Controller extends Piwik_Controller $avgTimeCallback = create_function('$time', 'return $time ? Piwik::getPrettyTimeFromSeconds($time, true, true, false) : "-";'); $view->queueFilter('ColumnCallbackReplace', array('avg_time_generation', $avgTimeCallback)); - $tooltipCallback = create_function('$hits', 'return $hits ? Piwik_Translate("Actions_AvgGenerationTimeTooltip", $hits) : false;'); - $view->queueFilter('ColumnCallbackAddMetadata', array('nb_hits_with_time_generation', 'avg_time_generation_tooltip', $tooltipCallback)); + $tooltipCallback = create_function('$hits, $min, $max', ' + return $hits ? + Piwik_Translate("Actions_AvgGenerationTimeTooltip", array( + $hits, "<br />", + Piwik::getPrettyTimeFromSeconds($min), + Piwik::getPrettyTimeFromSeconds($max) + )) + : false;'); + $view->queueFilter('ColumnCallbackAddMetadata', array( + array('nb_hits_with_time_generation', 'min_time_generation', 'max_time_generation'), + 'avg_time_generation_tooltip', $tooltipCallback)); } if (Piwik_Common::getRequestVar('enable_filter_excludelowpop', '0', 'string') != '0') { diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index ccfb6ca509..3c42391c1a 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -136,6 +136,11 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas // and an empty title $visitorAsite2->setGenerationTime(203); self::checkResponse($visitorAsite2->doTrackPageView('')); + + // track a page view with a domain alias to test the aggregation of both actions + $visitorAsite2->setUrl('http://example2alias.org/home#notIgnoredFragment#'); + $visitorAsite2->setGenerationTime(503); + self::checkResponse($visitorAsite2->doTrackPageView('')); } } diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_day.xml index d7d6159912..60d2c6a2bb 100644 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.2</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -25,6 +27,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -38,6 +42,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>0.6</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -53,6 +59,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -71,6 +79,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.4</min_time_generation> + <max_time_generation>0.8</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -84,6 +94,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.6</min_time_generation> + <max_time_generation>1.2</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -99,6 +111,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -117,6 +131,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.6</min_time_generation> + <max_time_generation>1.2</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -130,6 +146,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.9</min_time_generation> + <max_time_generation>1.8</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml index 01801ea24c..a40bfb0dea 100755 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml @@ -6,6 +6,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -22,6 +24,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -38,6 +42,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.2</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -56,6 +62,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -69,6 +77,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>0.6</max_time_generation> <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml index 7bb9a1ab16..6acf67f60c 100755 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml @@ -6,6 +6,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -24,6 +26,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.4</min_time_generation> + <max_time_generation>0.8</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -37,6 +41,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.6</min_time_generation> + <max_time_generation>1.2</max_time_generation> <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_day.xml index 0c7b6d9700..c9ae60575e 100644 --- a/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_day.xml @@ -6,6 +6,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -23,6 +25,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -40,6 +44,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -58,6 +64,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.2</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -77,6 +85,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -91,6 +101,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>0.6</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -106,6 +118,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -123,6 +137,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -140,6 +156,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -158,6 +176,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>0.4</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -177,6 +197,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.4</min_time_generation> + <max_time_generation>0.8</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -191,6 +213,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.6</min_time_generation> + <max_time_generation>1.2</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -206,6 +230,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -223,6 +249,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -240,6 +268,8 @@ <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>2</entry_sum_visit_length> @@ -258,6 +288,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>0.6</max_time_generation> <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> <entry_nb_visits>2</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> @@ -277,6 +309,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.6</min_time_generation> + <max_time_generation>1.2</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -291,6 +325,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.9</min_time_generation> + <max_time_generation>1.8</max_time_generation> <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> <exit_nb_visits>2</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml index 3bb9119b63..94423ac9d9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml @@ -6,6 +6,8 @@ <nb_hits>5</nb_hits> <sum_time_spent>170</sum_time_spent> <nb_hits_with_time_generation>5</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>1.324</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> @@ -21,6 +23,8 @@ <nb_hits>5</nb_hits> <sum_time_spent>170</sum_time_spent> <nb_hits_with_time_generation>5</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>1.324</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> @@ -36,6 +40,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>14</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.624</min_time_generation> + <max_time_generation>1.324</max_time_generation> <avg_time_on_page>14</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -48,6 +54,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>14</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.624</min_time_generation> + <max_time_generation>1.324</max_time_generation> <avg_time_on_page>14</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -62,6 +70,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>156</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.123</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>10</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> @@ -78,6 +88,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>156</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.123</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>10</entry_nb_actions> @@ -101,6 +113,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.343</min_time_generation> + <max_time_generation>0.543</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -112,6 +126,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.343</min_time_generation> + <max_time_generation>0.543</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -124,6 +140,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.343</min_time_generation> + <max_time_generation>0.543</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -140,6 +158,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>52</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.294</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>52</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -153,6 +173,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>52</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.294</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>52</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml index f54a34e323..88bdbcf6cd 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.635</min_time_generation> + <max_time_generation>0.635</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml index 71b8fe527c..616d1447df 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.837</min_time_generation> + <max_time_generation>0.837</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml index e0a6bc7aef..0e48fa0611 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml @@ -6,6 +6,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>720</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</max_time_generation> <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml index 3958a61539..12f05836b0 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>720</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</max_time_generation> <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml index f3b5a8262e..b557287b32 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml index 5f6715fd62..143b7b6035 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>720</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.523</min_time_generation> + <max_time_generation>0.523</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml index 35d0fb2442..bf311ea708 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</max_time_generation> <avg_time_on_page>360</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml index e8cb0f8c5c..3f1b605e45 100644 --- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml @@ -7,6 +7,8 @@ <nb_hits>4</nb_hits> <sum_time_spent>1080</sum_time_spent> <nb_hits_with_time_generation>4</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>1.233</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>6</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml index 5302932c1d..124e271777 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>7</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml index b7e57ccfe1..5b3878f7b2 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>7</entry_nb_actions> @@ -24,6 +26,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -41,6 +45,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml index 326ba6eef5..f80bfdd222 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml index 17dda0f1d2..3986b5b44b 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -21,6 +23,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -38,6 +42,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml index 67384a3686..629847ae61 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml index 6453866564..510f81282a 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>7</entry_nb_actions> @@ -61,6 +67,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -75,6 +83,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.224</min_time_generation> + <max_time_generation>0.224</max_time_generation> <avg_time_on_page>900</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml index ac40ada8ab..0880f58750 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml index a6f79cf627..62c8fa6fc8 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.224</min_time_generation> + <max_time_generation>0.224</max_time_generation> <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -20,6 +22,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -35,6 +39,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>7</entry_nb_actions> @@ -52,6 +58,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -69,6 +77,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml index a7cee4a486..793f02d8be 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml @@ -2,12 +2,16 @@ <result> <row> <label>Checkout</label> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <exit_rate>100%</exit_rate> <subtable> <row> <label> Purchasing...</label> <nb_uniq_visitors>1</nb_uniq_visitors> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <exit_rate>100%</exit_rate> </row> @@ -16,18 +20,24 @@ <row> <label> incredible title!</label> <nb_uniq_visitors>1</nb_uniq_visitors> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <avg_time_on_page>180</avg_time_on_page> <exit_rate>0%</exit_rate> </row> <row> <label> Looking at homepage (again)...</label> <nb_uniq_visitors>1</nb_uniq_visitors> + <min_time_generation>0.023</min_time_generation> + <max_time_generation>0.023</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <exit_rate>100%</exit_rate> </row> <row> <label> Second page view - should be registered as URL</label> <nb_uniq_visitors>1</nb_uniq_visitors> + <min_time_generation>0.224</min_time_generation> + <max_time_generation>0.224</max_time_generation> <avg_time_on_page>900</avg_time_on_page> <exit_rate>0%</exit_rate> </row> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml index cef5f1db67..9493eb4991 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>8</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml index fcc2cd595b..5e51da8014 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>8</entry_nb_actions> @@ -24,6 +26,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -41,6 +45,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml index faa38edcf3..64b810c76b 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -45,6 +49,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml index 82d409ed09..ef8f599623 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml @@ -8,6 +8,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -22,6 +24,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -39,6 +43,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml index 67384a3686..629847ae61 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml index b7dd928690..da8ea736e7 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml @@ -8,6 +8,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml index 6615b7d1a3..cd205048c8 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml @@ -6,6 +6,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -23,6 +25,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>8</entry_nb_actions> @@ -62,6 +68,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -76,6 +84,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>792</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.224</min_time_generation> + <max_time_generation>0.224</max_time_generation> <avg_time_on_page>792</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml index e93472d54c..46a13d42c3 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml @@ -8,6 +8,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml index e93472d54c..46a13d42c3 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml @@ -8,6 +8,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml index ab5b0e8d3a..ad64d61bfe 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.224</min_time_generation> + <max_time_generation>0.224</max_time_generation> <avg_time_on_page>180</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -21,6 +23,8 @@ <sum_time_spent>0</sum_time_spent> <nb_hits_following_search>1</nb_hits_following_search> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.024</min_time_generation> + <max_time_generation>0.024</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -36,6 +40,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>180</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.234</min_time_generation> + <max_time_generation>0.234</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>8</entry_nb_actions> @@ -53,6 +59,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <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> @@ -70,6 +78,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.134</min_time_generation> + <max_time_generation>0.134</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml index a541c425e7..4930a5c396 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml @@ -15,13 +15,13 @@ <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> - <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_actions_per_visit>3</nb_actions_per_visit> + <avg_time_on_site>2</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml index c46488cec6..bf6186ee73 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml @@ -13,13 +13,13 @@ </result> <result idSite="2"> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> - <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_actions_per_visit>3</nb_actions_per_visit> + <avg_time_on_site>2</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml index a541c425e7..4930a5c396 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml @@ -15,13 +15,13 @@ <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> - <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_actions_per_visit>3</nb_actions_per_visit> + <avg_time_on_site>2</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml index c46488cec6..bf6186ee73 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml @@ -13,13 +13,13 @@ </result> <result idSite="2"> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> - <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_actions_per_visit>3</nb_actions_per_visit> + <avg_time_on_site>2</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index d53faa9a4f..fef0db55eb 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -97,8 +97,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml index a541c425e7..4930a5c396 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml @@ -15,13 +15,13 @@ <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted>1</nb_visits_converted> <bounce_count /> - <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <sum_visit_length>2</sum_visit_length> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> - <avg_time_on_site>1</avg_time_on_site> + <nb_actions_per_visit>3</nb_actions_per_visit> + <avg_time_on_site>2</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml index 8a95688245..eefd33ca1b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml @@ -28,8 +28,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml index 61a8a0128b..879bd15096 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml index ff2bcd47ee..ac0858dd81 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml @@ -29,8 +29,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml index 688fe16d5b..a56856f4eb 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml index 8a95688245..eefd33ca1b 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml @@ -28,8 +28,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml index 61a8a0128b..879bd15096 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml index ff2bcd47ee..ac0858dd81 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml @@ -29,8 +29,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml index 688fe16d5b..a56856f4eb 100755 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml @@ -15,8 +15,8 @@ </row> <row> <label>Site 2</label> - <nb_pageviews>2</nb_pageviews> - <nb_actions>2</nb_actions> + <nb_pageviews>3</nb_pageviews> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml index 97a6e21b65..e51d617dda 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml @@ -15,13 +15,13 @@ <result idSite="2"> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> + <nb_actions>3</nb_actions> <nb_visits_converted /> <bounce_count /> <sum_visit_length>1</sum_visit_length> - <max_actions>2</max_actions> + <max_actions>3</max_actions> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> + <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> </results> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml index ca296748c5..31cace930f 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml @@ -8,6 +8,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml index 4cd865279a..681560b5cc 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml index 4cd865279a..681560b5cc 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml index 4cd865279a..681560b5cc 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml index 792ebc6d4c..b8e32ae7a9 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml @@ -9,6 +9,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -30,6 +32,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -43,6 +47,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -58,6 +64,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -74,6 +82,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> @@ -91,6 +101,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -106,6 +118,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -119,6 +133,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> @@ -141,13 +157,15 @@ <label>Page Name not defined</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.503</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.203</avg_time_generation> + <avg_time_generation>0.353</avg_time_generation> </row> <row> <label> Website 2 page view</label> @@ -156,9 +174,11 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.193</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml index f80b269cc7..60de2fb384 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -27,6 +29,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -42,6 +46,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -57,6 +63,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -74,6 +82,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -90,6 +100,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -102,6 +114,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -118,6 +132,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -137,14 +153,16 @@ <row> <label>Page Name not defined</label> <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.503</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.203</avg_time_generation> + <avg_time_generation>0.353</avg_time_generation> </row> <row> <label> Website 2 page view</label> @@ -152,8 +170,10 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.193</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml index 6b3b671df8..e7cb300859 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -29,6 +31,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -44,6 +48,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -59,6 +65,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -76,6 +84,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -92,6 +102,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -104,6 +116,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -120,6 +134,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -139,14 +155,16 @@ <row> <label>Page Name not defined</label> <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.503</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.203</avg_time_generation> + <avg_time_generation>0.353</avg_time_generation> </row> <row> <label> Website 2 page view</label> @@ -154,8 +172,10 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.193</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml index adcc8e897e..b7bb7b48dd 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -27,6 +29,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -42,6 +46,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -57,6 +63,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -74,6 +82,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -90,6 +100,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -102,6 +114,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -118,6 +132,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -137,14 +153,16 @@ <row> <label>Page Name not defined</label> <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.503</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <avg_time_generation>0.203</avg_time_generation> + <avg_time_generation>0.353</avg_time_generation> </row> <row> <label> Website 2 page view</label> @@ -152,8 +170,10 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.193</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml index 3f6d8dca40..b6289ada87 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml @@ -9,6 +9,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -22,6 +24,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -44,6 +48,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -59,6 +65,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> @@ -77,6 +85,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>360</avg_time_on_page> @@ -92,6 +102,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -109,20 +121,24 @@ <result date="2010-01-04"> <row> <label>/home#notIgnoredFragment</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.503</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> + <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0.193</avg_time_generation> + <exit_rate>50%</exit_rate> + <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> </row> <row> @@ -132,6 +148,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.203</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml index c6d72844cd..0bd7e3b22c 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -26,6 +28,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -39,6 +43,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -59,6 +65,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -80,20 +88,24 @@ <result date="2010-01"> <row> <label>/home#notIgnoredFragment</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.503</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0.193</avg_time_generation> + <exit_rate>50%</exit_rate> + <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> </row> <row> @@ -102,6 +114,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.203</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml index c522b90f1f..34c5e20eaf 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml @@ -8,6 +8,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -21,6 +23,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -43,6 +47,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -56,6 +62,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -74,6 +82,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -95,20 +105,24 @@ <result date="From 2010-01-04 to 2010-01-10"> <row> <label>/home#notIgnoredFragment</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.503</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0.193</avg_time_generation> + <exit_rate>50%</exit_rate> + <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> </row> <row> @@ -117,6 +131,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.203</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml index b831411667..1bd8fe2436 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -26,6 +28,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -39,6 +43,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -59,6 +65,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -80,20 +88,24 @@ <result date="2010"> <row> <label>/home#notIgnoredFragment</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.193</min_time_generation> + <max_time_generation>0.503</max_time_generation> <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>1</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0.193</avg_time_generation> + <exit_rate>50%</exit_rate> + <avg_time_generation>0.348</avg_time_generation> <url>http://example2.com/home#notIgnoredFragment</url> </row> <row> @@ -102,6 +114,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.203</min_time_generation> + <max_time_generation>0.203</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml index 2bb31193b5..fcde4a00e7 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml @@ -62,8 +62,8 @@ <label>only-homepage-referer.com</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> @@ -72,8 +72,8 @@ <label>http://only-homepage-referer.com/</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml index 09bcffd1fe..193886576d 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml @@ -47,8 +47,8 @@ <row> <label>only-homepage-referer.com</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> @@ -57,8 +57,8 @@ <row> <label>http://only-homepage-referer.com/</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml index 349dccdc29..e07b90f4ca 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml @@ -48,8 +48,8 @@ <row> <label>only-homepage-referer.com</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> @@ -58,8 +58,8 @@ <row> <label>http://only-homepage-referer.com/</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml index c633cb0218..ffc1e2cfa1 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml @@ -47,8 +47,8 @@ <row> <label>only-homepage-referer.com</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> @@ -57,8 +57,8 @@ <row> <label>http://only-homepage-referer.com/</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml index 72bc7760a7..4133f81ce5 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml @@ -39,13 +39,13 @@ <result idSite="2"> <result date="2010-01-03" /> <result date="2010-01-04"> - <max_actions>2</max_actions> - <nb_actions>2</nb_actions> + <max_actions>3</max_actions> + <nb_actions>3</nb_actions> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> + <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> <result date="2010-01-05" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml index 893e581f52..e4c2a93ef9 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml @@ -21,13 +21,13 @@ </result> <result idSite="2"> <result date="2010-01"> - <max_actions>2</max_actions> - <nb_actions>2</nb_actions> + <max_actions>3</max_actions> + <nb_actions>3</nb_actions> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> + <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml index de9b678aaf..33acb7218d 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml @@ -30,13 +30,13 @@ <result idSite="2"> <result date="From 2009-12-28 to 2010-01-03" /> <result date="From 2010-01-04 to 2010-01-10"> - <max_actions>2</max_actions> - <nb_actions>2</nb_actions> + <max_actions>3</max_actions> + <nb_actions>3</nb_actions> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> + <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> <result date="From 2010-01-11 to 2010-01-17" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml index 49a6e6ccaf..eb45008e28 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml @@ -20,12 +20,12 @@ </result> <result idSite="2"> <result date="2010"> - <max_actions>2</max_actions> - <nb_actions>2</nb_actions> + <max_actions>3</max_actions> + <nb_actions>3</nb_actions> <nb_visits>1</nb_visits> <sum_visit_length>1</sum_visit_length> <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>2</nb_actions_per_visit> + <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>1</avg_time_on_site> </result> <result date="2011" /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml index c62b14c6ae..170a9db754 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml @@ -10,6 +10,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml index b5ca864eb4..4a9b67425f 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml index 0e2bbd67f7..bbcd3d27bd 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml @@ -8,6 +8,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml index 7c3bd42fad..551c053201 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml index 562d161a75..fb70c57e44 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml @@ -8,6 +8,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -29,6 +31,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -42,6 +46,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -57,6 +63,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -73,6 +81,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> @@ -90,6 +100,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -105,6 +117,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -118,6 +132,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml index 2720f57c07..aef97afa2b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -26,6 +28,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -41,6 +45,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -56,6 +62,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -73,6 +81,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -89,6 +99,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -101,6 +113,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -117,6 +131,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml index c991adb6de..b24ed893cb 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -28,6 +30,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -43,6 +47,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -58,6 +64,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -75,6 +83,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -91,6 +101,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -103,6 +115,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -119,6 +133,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml index 8fad90c45f..9a74392262 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.153</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> @@ -26,6 +28,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -41,6 +45,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>900</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -56,6 +62,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -73,6 +81,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>540</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.173</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>540</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -89,6 +99,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -101,6 +113,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.452</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> @@ -117,6 +131,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml index 9bc08b2f17..5356379369 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml @@ -8,6 +8,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -24,6 +26,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml index 24457eeee3..4f3fa347dd 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml index 5ffe914524..0dde9918f9 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -22,6 +24,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml index ee2fb1a584..75ff4aac93 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml index 2f848f4af1..edae025832 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml @@ -8,6 +8,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -21,6 +23,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>1</entry_nb_actions> @@ -43,6 +47,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> @@ -58,6 +64,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> @@ -76,6 +84,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> <exit_nb_visits>1</exit_nb_visits> <avg_time_on_page>360</avg_time_on_page> @@ -91,6 +101,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml index e7fa9add6a..034f233563 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -25,6 +27,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -38,6 +42,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -58,6 +64,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml index 76ffa12850..d46e192d04 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml @@ -7,6 +7,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.123</max_time_generation> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -20,6 +22,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -42,6 +46,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -55,6 +61,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.323</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -73,6 +81,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml index 5348f885e0..36d2f61b31 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml @@ -7,6 +7,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.123</min_time_generation> + <max_time_generation>0.323</max_time_generation> <entry_nb_visits>1</entry_nb_visits> <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>901</entry_sum_visit_length> @@ -25,6 +27,8 @@ <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.223</min_time_generation> + <max_time_generation>0.223</max_time_generation> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> @@ -38,6 +42,8 @@ <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>1</nb_hits_with_time_generation> + <min_time_generation>0.153</min_time_generation> + <max_time_generation>0.153</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> @@ -58,6 +64,8 @@ <nb_hits>2</nb_hits> <sum_time_spent>360</sum_time_spent> <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.173</min_time_generation> + <max_time_generation>0.452</max_time_generation> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html index fec52b8dfc..f2b131a8b4 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html @@ -311,10 +311,10 @@ Site 2 1 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -2 +3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -2 +3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> $ 0 diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf index b4254232b8b96df7e20e39dbe4c83d1629ce82d6..8dfb89049d66da362f24f9c2abe54cf1cbce78f3 100644 GIT binary patch delta 8601 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 delta 8151 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 Vp*Rc|<xMI$hFVZi`IZXx{{Wd7L&pFB diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt index 5cc3bbeda1..398cd7cdd7 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt @@ -1 +1 @@ -2010, January. Site 1: 3 Visits (+100%), 8 Actions (+100%). Site 2: 1 Visits (+100%), 2 Actions (+100%) \ No newline at end of file +2010, January. Site 1: 3 Visits (+100%), 8 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%) \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf index 481bdf6290d28b671fc11f473b6c5967dadcf686..5c00d0a6fccb03e6e0c792ed07503fc737164803 100644 GIT binary patch delta 4050 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 delta 4062 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 Xv=Gv^p5Z1_Op&A+K75krWX=BpLmY<G -- GitLab