diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index c69792ba9c9937aacbafbf16bd250eee33a8cc97..a1c54e59d1d2c6ccd8a94c846936fbdf26a638ce 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -495,19 +495,21 @@ class Report
$processedMetrics = $this->processedMetrics ?: array();
foreach ($processedMetrics as $processedMetric) {
- if (!($processedMetric instanceof ProcessedMetric)) {
- continue;
- }
-
- $name = $processedMetric->getName();
- $metricDocs = $processedMetric->getDocumentation();
- if (empty($metricDocs)) {
- $metricDocs = @$translations[$name];
+ if (is_string($processedMetric) && !empty($translations[$processedMetric])) {
+ $documentation[$processedMetric] = $translations[$processedMetric];
+ } elseif ($processedMetric instanceof ProcessedMetric) {
+
+ $name = $processedMetric->getName();
+ $metricDocs = $processedMetric->getDocumentation();
+ if (empty($metricDocs)) {
+ $metricDocs = @$translations[$name];
+ }
+
+ if (!empty($metricDocs)) {
+ $documentation[$processedMetric->getName()] = $metricDocs;
+ }
}
- if (!empty($metricDocs)) {
- $documentation[$processedMetric->getName()] = $metricDocs;
- }
}
return $documentation;
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 06f04447e21aa3db93d4cc8cc69b7d6903841577..635840afda00b1ca72e014fca66d7d2f88ef7c59 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -23,9 +23,9 @@ use Piwik\Period;
use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Plugins\API\DataTable\MergeDataTables;
use Piwik\Plugins\CoreAdminHome\CustomLogo;
use Piwik\Segment\SegmentExpression;
-use Piwik\Translate;
use Piwik\Translation\Translator;
use Piwik\Version;
@@ -417,7 +417,8 @@ class API extends \Piwik\Plugin\API
if ($mergedDataTable === false) {
$mergedDataTable = $dataTable;
} else {
- $this->mergeDataTables($mergedDataTable, $dataTable);
+ $merger = new MergeDataTables();
+ $merger->mergeDataTables($mergedDataTable, $dataTable);
}
}
@@ -430,41 +431,6 @@ class API extends \Piwik\Plugin\API
return $mergedDataTable;
}
- /**
- * Merge the columns of two data tables.
- * Manipulates the first table.
- */
- private function mergeDataTables($table1, $table2)
- {
- // handle table arrays
- if ($table1 instanceof DataTable\Map && $table2 instanceof DataTable\Map) {
- $subTables2 = $table2->getDataTables();
- foreach ($table1->getDataTables() as $index => $subTable1) {
- if (!array_key_exists($index, $subTables2)) {
- // occurs when archiving starts on dayN and continues into dayN+1, see https://github.com/piwik/piwik/issues/5168#issuecomment-50959925
- continue;
- }
- $subTable2 = $subTables2[$index];
- $this->mergeDataTables($subTable1, $subTable2);
- }
- return;
- }
-
- $firstRow2 = $table2->getFirstRow();
- if (!($firstRow2 instanceof Row)) {
- return;
- }
-
- $firstRow1 = $table1->getFirstRow();
- if (empty($firstRow1)) {
- $firstRow1 = $table1->addRow(new Row());
- }
-
- foreach ($firstRow2->getColumns() as $metric => $value) {
- $firstRow1->setColumn($metric, $value);
- }
- }
-
/**
* Given an API report to query (eg. "Referrers.getKeywords", and a Label (eg. "free%20software"),
* this function will query the API for the previous days/weeks/etc. and will return
diff --git a/plugins/API/DataTable/MergeDataTables.php b/plugins/API/DataTable/MergeDataTables.php
new file mode 100644
index 0000000000000000000000000000000000000000..7aebca346046fcc2ff7ddfbbd0dd23e56ac1afb3
--- /dev/null
+++ b/plugins/API/DataTable/MergeDataTables.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\API\DataTable;
+
+use Piwik\DataTable\Row;
+use Piwik\DataTable;
+
+class MergeDataTables
+{
+
+ /**
+ * Merge the columns of two data tables.
+ * Manipulates the first table.
+ *
+ * @param DataTable|DataTable\Map $table1 The table to eventually filter.
+ * @param DataTable|DataTable\Map $table2 Whether to delete rows with no visits or not.
+ */
+ public function mergeDataTables($table1, $table2)
+ {
+ // handle table arrays
+ if ($table1 instanceof DataTable\Map && $table2 instanceof DataTable\Map) {
+ $subTables2 = $table2->getDataTables();
+ foreach ($table1->getDataTables() as $index => $subTable1) {
+ if (!array_key_exists($index, $subTables2)) {
+ // occurs when archiving starts on dayN and continues into dayN+1, see https://github.com/piwik/piwik/issues/5168#issuecomment-50959925
+ continue;
+ }
+ $subTable2 = $subTables2[$index];
+ $this->mergeDataTables($subTable1, $subTable2);
+ }
+ return;
+ }
+
+ $firstRow2 = $table2->getFirstRow();
+ if (!($firstRow2 instanceof Row)) {
+ return;
+ }
+
+ $firstRow1 = $table1->getFirstRow();
+ if (empty($firstRow1)) {
+ $firstRow1 = $table1->addRow(new Row());
+ }
+
+ foreach ($firstRow2->getColumns() as $metric => $value) {
+ $firstRow1->setColumn($metric, $value);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
index 9327934fa529fb4651088957e92ac0fc8ccb8d11..0cbc594646814ecd0526029112104a390c33aa1a 100644
--- a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
+++ b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
@@ -18,6 +18,15 @@
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>2541</revenue>
+ <conversion_rate>50%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>2541</revenue_new_visit>
+ <conversion_rate_new_visit>50%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
<nb_pageviews>3</nb_pageviews>
<nb_uniq_pageviews>3</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
@@ -26,7 +35,6 @@
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>1</nb_searches>
<nb_keywords>1</nb_keywords>
- <conversion_rate>50%</conversion_rate>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>632</avg_time_on_site>
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index e4ecb322e55f58a69d5d8bc9b9352d661b309783..2cb2366c34aef3a44dfbab453ceb6cf4a1428727 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\Goals;
use Exception;
+use Piwik\API\Request;
use Piwik\Archive;
use Piwik\CacheId;
use Piwik\Cache as PiwikCache;
@@ -18,11 +19,14 @@ use Piwik\Db;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\Plugin\Report;
+use Piwik\Plugins\API\DataTable\MergeDataTables;
use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
use Piwik\Plugins\Goals\Columns\Metrics\AverageOrderRevenue;
+use Piwik\Segment\SegmentExpression;
use Piwik\Site;
use Piwik\Tracker\Cache;
use Piwik\Tracker\GoalManager;
+use Piwik\Plugins\VisitFrequency\API as VisitFrequencyAPI;
/**
* Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal",
@@ -327,7 +331,7 @@ class API extends \Piwik\Plugin\API
}
/**
- * Returns Goals data
+ * Returns Goals data.
*
* @param int $idSite
* @param string $period
@@ -338,6 +342,55 @@ class API extends \Piwik\Plugin\API
* @return DataTable
*/
public function get($idSite, $period, $date, $segment = false, $idGoal = false, $columns = array())
+ {
+ Piwik::checkUserHasViewAccess($idSite);
+
+ /** @var DataTable|DataTable\Map $table */
+ $table = null;
+
+ $segments = array(
+ '' => false,
+ '_new_visit' => 'visitorType%3D%3Dnew', // visitorType==new
+ '_returning_visit' => VisitFrequencyAPI::RETURNING_VISITOR_SEGMENT
+ );
+
+ foreach ($segments as $appendToMetricName => $predefinedSegment) {
+ $segmentToUse = $this->appendSegment($predefinedSegment, $segment);
+
+ /** @var DataTable|DataTable\Map $tableSegmented */
+ $tableSegmented = Request::processRequest('Goals.getMetrics', array(
+ 'segment' => $segmentToUse,
+ 'idSite' => $idSite,
+ 'period' => $period,
+ 'date' => $date,
+ 'idGoal' => $idGoal,
+ 'columns' => $columns,
+ 'serialize' => '0'
+ ));
+
+ $tableSegmented->filter('Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames',
+ array($appendToMetricName));
+
+ if (!isset($table)) {
+ $table = $tableSegmented;
+ } else {
+ $merger = new MergeDataTables();
+ $merger->mergeDataTables($table, $tableSegmented);
+ }
+ }
+
+ return $table;
+ }
+
+ /**
+ * Similar to {@link get()} but does not return any metrics for new and returning visitors. It won't apply
+ * any segment by default. This method is deprecated from the API as it is only there to make the implementation of
+ * the actual {@link get()} method easy.
+ *
+ * @deprecated
+ * @internal
+ */
+ public function getMetrics($idSite, $period, $date, $segment = false, $idGoal = false, $columns = array())
{
Piwik::checkUserHasViewAccess($idSite);
$archive = Archive::build($idSite, $period, $date, $segment);
@@ -349,7 +402,7 @@ class API extends \Piwik\Plugin\API
$allMetrics = Goals::getGoalColumns($idGoal);
$requestedColumns = Piwik::getArrayFromApiParameter($columns);
- $report = Report::factory("Goals", "get");
+ $report = Report::factory('Goals', 'getMetrics');
$columnsToGet = $report->getMetricsRequiredForReport($allMetrics, $requestedColumns);
$inDbMetricNames = array_map(function ($name) use ($idGoal) {
@@ -368,7 +421,7 @@ class API extends \Piwik\Plugin\API
// it's not in ProcessedReport.php). more refactoring must be done to report class before this can be
// corrected.
if ((in_array('avg_order_revenue', $requestedColumns)
- || empty($requestedColumns))
+ || empty($requestedColumns))
&& $isEcommerceGoal
) {
$dataTable->filter(function (DataTable $table) {
@@ -391,6 +444,22 @@ class API extends \Piwik\Plugin\API
return $dataTable;
}
+ protected function appendSegment($segment, $segmentToAppend)
+ {
+ if (empty($segment)) {
+ return $segmentToAppend;
+ }
+
+ if (empty($segmentToAppend)) {
+ return $segment;
+ }
+
+ $segment .= urlencode(SegmentExpression::AND_DELIMITER);
+ $segment .= $segmentToAppend;
+
+ return $segment;
+ }
+
protected function getNumeric($idSite, $period, $date, $segment, $toFetch)
{
Piwik::checkUserHasViewAccess($idSite);
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 356a4aafccf00655856cac5baa197a60a86b76ba..f7775262a3483446ad606eed1f33df75300d3619 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -48,13 +48,13 @@ class Controller extends \Piwik\Plugin\Controller
*/
private $translator;
- private function formatConversionRate($conversionRate)
+ private function formatConversionRate($conversionRate, $columnName = 'conversion_rate')
{
if ($conversionRate instanceof DataTable) {
if ($conversionRate->getRowsCount() == 0) {
$conversionRate = 0;
} else {
- $conversionRate = $conversionRate->getFirstRow()->getColumn('conversion_rate');
+ $conversionRate = $conversionRate->getFirstRow()->getColumn($columnName);
}
}
@@ -128,14 +128,11 @@ class Controller extends \Piwik\Plugin\Controller
$view->nameGraphEvolution = 'Goals.getEvolutionGraph' . $idGoal;
$view->topDimensions = $this->getTopDimensions($idGoal);
- // conversion rate for new and returning visitors
- $segment = urldecode(\Piwik\Plugins\VisitFrequency\API::RETURNING_VISITOR_SEGMENT);
- $conversionRateReturning = Request::processRequest("Goals.get", array('segment' => $segment, 'idGoal' => $idGoal));
- $view->conversion_rate_returning = $this->formatConversionRate($conversionRateReturning);
+ $goalMetrics = Request::processRequest('Goals.get', array('idGoal' => $idGoal));
- $segment = 'visitorType==new';
- $conversionRateNew = Request::processRequest("Goals.get", array('segment' => $segment, 'idGoal' => $idGoal));
- $view->conversion_rate_new = $this->formatConversionRate($conversionRateNew);
+ // conversion rate for new and returning visitors
+ $view->conversion_rate_returning = $this->formatConversionRate($goalMetrics, 'conversion_rate_returning_visit');
+ $view->conversion_rate_new = $this->formatConversionRate($goalMetrics, 'conversion_rate_new_visit');
$view->goalReportsByDimension = $this->getGoalReportsByDimensionTable(
$view->nb_conversions, isset($ecommerce), !empty($view->cart_nb_conversions));
diff --git a/plugins/Goals/DataTable/Filter/AppendNameToColumnNames.php b/plugins/Goals/DataTable/Filter/AppendNameToColumnNames.php
new file mode 100644
index 0000000000000000000000000000000000000000..70c25428927a3213e7225cae4eec0e3c017b0943
--- /dev/null
+++ b/plugins/Goals/DataTable/Filter/AppendNameToColumnNames.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Goals\DataTable\Filter;
+
+use Piwik\DataTable\BaseFilter;
+use Piwik\DataTable;
+use Piwik\Metrics;
+
+/**
+ * Appends a string to each column name in each row of a table. Please note this filter even appends the name to a
+ * 'label' column. If you do not need this behaviour feel free to add a check to ignore label columns.
+ */
+class AppendNameToColumnNames extends BaseFilter
+{
+ protected $nameToAppend;
+
+ /**
+ * Constructor.
+ *
+ * @param DataTable $table The table that will be eventually filtered.
+ * @param string $nameToAppend The name that will be appended to each column
+ */
+ public function __construct($table, $nameToAppend)
+ {
+ parent::__construct($table);
+ $this->nameToAppend = $nameToAppend;
+ }
+
+ /**
+ * See {@link ReplaceColumnNames}.
+ *
+ * @param DataTable $table
+ */
+ public function filter($table)
+ {
+ if (!isset($this->nameToAppend) || '' === $this->nameToAppend || false === $this->nameToAppend) {
+ return;
+ }
+
+ foreach ($table->getRows() as $row) {
+ $columns = $row->getColumns();
+
+ foreach ($columns as $column => $value) {
+ $row->deleteColumn($column);
+ $row->setColumn($column . $this->nameToAppend, $value);
+ }
+
+ $this->filterSubTable($row);
+ }
+ }
+}
diff --git a/plugins/Goals/Reports/Get.php b/plugins/Goals/Reports/Get.php
index 163d9fe2363fdc6356d6c4d2c5cfb36e903a8015..bccecda1464f3c0b55cd2135f84a4437473b897e 100644
--- a/plugins/Goals/Reports/Get.php
+++ b/plugins/Goals/Reports/Get.php
@@ -9,7 +9,6 @@
namespace Piwik\Plugins\Goals\Reports;
use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
class Get extends Base
{
@@ -18,7 +17,7 @@ class Get extends Base
parent::init();
$this->name = Piwik::translate('Goals_Goals');
- $this->processedMetrics = array(new ConversionRate());
+ $this->processedMetrics = array('conversion_rate');
$this->documentation = ''; // TODO
$this->order = 1;
$this->orderGoal = 50;
diff --git a/plugins/Goals/Reports/GetMetrics.php b/plugins/Goals/Reports/GetMetrics.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2104823db3353244cb0cb8b4aef67586653975e
--- /dev/null
+++ b/plugins/Goals/Reports/GetMetrics.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Goals\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
+
+class GetMetrics extends Base
+{
+ protected function init()
+ {
+ parent::init();
+
+ $this->name = Piwik::translate('Goals_Goals');
+ $this->processedMetrics = array(new ConversionRate());
+ $this->documentation = ''; // TODO
+ $this->order = 1;
+ $this->orderGoal = 50;
+ $this->metrics = array( 'nb_conversions', 'nb_visits_converted', 'revenue');
+ $this->parameters = null;
+ }
+
+ public function configureReportMetadata(&$availableReports, $infos)
+ {
+ }
+}
diff --git a/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php b/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b409ae1fbb399be02183f6e3296ae1ad0426c313
--- /dev/null
+++ b/plugins/Goals/tests/Unit/AppendNameToColumnNamesTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\Goals\tests\Unit;
+
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+use Piwik\Tests\Framework\TestCase\UnitTestCase;
+
+/**
+ * @group AppendNameToColumnNamesTest
+ * @group AppendNameToColumnNames
+ * @group DataTable
+ * @group Filter
+ * @group Goals
+ */
+class AppendNameToColumnNamesTest extends UnitTestCase
+{
+ private $filter = 'Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames';
+
+ /**
+ * @var DataTable
+ */
+ private $table;
+
+ public function setUp()
+ {
+ $this->table = new DataTable\Simple();
+ $this->addRow(array('nb_visits' => 1, 'nb_conversions' => 5, 'revenue' => 10, 'conversion_rate' => 20));
+ }
+
+ private function addRow($columns)
+ {
+ $this->table->addRow($this->buildRow($columns));
+ }
+
+ private function buildRow($columns)
+ {
+ return new Row(array(Row::COLUMNS => $columns));
+ }
+
+ public function test_filter_shouldNotAppendAnything_IfNameToReplaceIsEmpty()
+ {
+ $columnNamesBefore = array('nb_visits', 'nb_conversions', 'revenue', 'conversion_rate');
+
+ $this->table->filter($this->filter, array(''));
+ $this->table->filter($this->filter, array(null));
+ $this->table->filter($this->filter, array(false));
+
+ $columnNamesAfter = array_keys($this->table->getFirstRow()->getColumns());
+ $this->assertSame($columnNamesBefore, $columnNamesAfter);
+ }
+
+ public function test_filter_shoulAppendGivenStringToAllColumns_IfSet()
+ {
+ $nameToAppend = '_new_visit';
+ $this->table->filter($this->filter, array($nameToAppend));
+
+ $expected = array(
+ 'nb_visits' . $nameToAppend => 1,
+ 'nb_conversions' . $nameToAppend => 5,
+ 'revenue' . $nameToAppend => 10,
+ 'conversion_rate' . $nameToAppend => 20
+ );
+
+ $this->assertColumnsOfRowIdEquals($expected, $rowId = 0);
+ }
+
+ public function test_filter_shoulAppendGivenStringToAllColumnsOfAllRows_EvenIfTheyHaveDifferentColumns()
+ {
+ $this->addRow(array('nb_visits' => 49));
+
+ $nameToAppend = '_new_visit';
+ $this->table->filter($this->filter, array($nameToAppend));
+
+ $expectedRow1 = array(
+ 'nb_visits' . $nameToAppend => 1,
+ 'nb_conversions' . $nameToAppend => 5,
+ 'revenue' . $nameToAppend => 10,
+ 'conversion_rate' . $nameToAppend => 20
+ );
+
+ $expectedRow2 = array(
+ 'nb_visits' . $nameToAppend => 49,
+ );
+
+ $this->assertColumnsOfRowIdEquals($expectedRow1, $rowId = 0);
+ $this->assertColumnsOfRowIdEquals($expectedRow2, $rowId = 1);
+ }
+
+ private function assertColumnsOfRowIdEquals($expectedColumns, $rowId)
+ {
+ $this->assertSame($expectedColumns, $this->table->getRowFromId($rowId)->getColumns());
+ }
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
index 21e8a5254246909d80c30bee4dfad1c7c02fb790..8e535be0f20f25bbf9a26554e5ae1248a0ea3d85 100644
--- a/tests/PHPUnit/Integration/ReportTest.php
+++ b/tests/PHPUnit/Integration/ReportTest.php
@@ -340,7 +340,11 @@ class ReportTest extends IntegrationTestCase
'nb_visits' => 'General_ColumnNbVisitsDocumentation',
'nb_uniq_visitors' => 'General_ColumnNbUniqVisitorsDocumentation',
'nb_actions' => 'General_ColumnNbActionsDocumentation',
- 'nb_users' => 'General_ColumnNbUsersDocumentation'
+ 'nb_users' => 'General_ColumnNbUsersDocumentation',
+ 'nb_actions_per_visit' => 'General_ColumnActionsPerVisitDocumentation',
+ 'avg_time_on_site' => 'General_ColumnAvgTimeOnSiteDocumentation',
+ 'bounce_rate' => 'General_ColumnBounceRateDocumentation',
+ 'conversion_rate' => 'General_ColumnConversionRateDocumentation',
),
'processedMetrics' => array(
'nb_actions_per_visit' => 'General_ColumnActionsPerVisit',
@@ -377,6 +381,8 @@ class ReportTest extends IntegrationTestCase
'metricsDocumentation' => array(
'nb_actions' => 'General_ColumnNbActionsDocumentation',
'nb_visits' => 'General_ColumnNbVisitsDocumentation',
+ 'conversion_rate' => 'General_ColumnConversionRateDocumentation',
+ 'bounce_rate' => 'General_ColumnBounceRateDocumentation',
),
'processedMetrics' => array(
'conversion_rate' => 'General_ColumnConversionRate',
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index 42d247f92412a83d5d62fed5c9127213311638c0..08027d6fde145e2a9174f0f107a0d24b576ddd81 100644
--- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
@@ -106,7 +106,8 @@ class BackwardsCompatibility1XTest extends SystemTestCase
// those reports generate a different segment as a different raw value was stored that time
'DevicesDetection.getOsVersions',
'UserSettings.getOS',
- 'UserSettings.getBrowserType'
+ 'UserSettings.getBrowserType',
+ 'Goals.get'
);
$apiNotToCall = array(
diff --git a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index 8c4ec84d98624224c3d13181345dcdadeff737ef..74d1de4a834bb0e9b29dbfdec659e9daffb09e8e 100755
--- a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
+++ b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
@@ -66,9 +66,15 @@ class PeriodIsRangeDateIsLastNMetadataAndNormalAPITest extends SystemTestCase
$result = array();
foreach ($segments as $segment) {
+ $testSuffix = '';
+ if (!empty($segment) && false !== strpos($segment, 'pageUrl')) {
+ $testSuffix .= '_pagesegment';
+ }
+
foreach ($dates as $date) {
$result[] = array($apiToCall, array('idSite' => $idSite, 'date' => $date,
'periods' => array('range'), 'segment' => $segment,
+ 'testSuffix' => $testSuffix,
'otherRequestParameters' => array(
'lastMinutes' => 60 * 24 * 2,
'visitorId' => $visitorId // testing getLastVisitsForVisitor requires a visitor ID
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Goals.get_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d206c1dee153f9587a970a0ff8788212a33300cd
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Goals.get_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>43</revenue>
+ <conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7ada36be0de409c215b775b9194f1ed3bae4e5f1
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>33</nb_conversions>
+ <nb_visits_converted>33</nb_visits_converted>
+ <revenue>165</revenue>
+ <conversion_rate>89.19%</conversion_rate>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 7ada36be0de409c215b775b9194f1ed3bae4e5f1..13474931edd5e1795159d1f93fd099fa0379f081 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>33</nb_visits_converted>
<revenue>165</revenue>
<conversion_rate>89.19%</conversion_rate>
+ <nb_conversions_new_visit>30</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>30</nb_visits_converted_new_visit>
+ <revenue_new_visit>150</revenue_new_visit>
+ <conversion_rate_new_visit>88.24%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>3</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>15</revenue_returning_visit>
+ <conversion_rate_returning_visit>100%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
index 573f3d55800f1755119e9125735e97f31b6151c7..a5d5b6ff1792e9d177a50ded8a336174fedac272 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
@@ -20,6 +20,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
index 01cf6797a002a7450918fb380bde9c0c5e5b51d1..57e19c28198d4662379544b474d4dbab595834b6 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
@@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>100%</result>
\ No newline at end of file
+<result>
+ <conversion_rate>100%</conversion_rate>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <conversion_rate_returning_visit>100%</conversion_rate_returning_visit>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getMetrics_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getMetrics_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..24662c288cbce5bf887e373e1489802fb2f91413
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getMetrics_day.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>43</revenue>
+ <conversion_rate>100%</conversion_rate>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
index 24662c288cbce5bf887e373e1489802fb2f91413..05d799d99b998fe750264b49cc891dfedcc4bb0c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>43</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>42</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>1</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>1</revenue_returning_visit>
+ <conversion_rate_returning_visit>100%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index ccf95a9d554be720b366366d3b3c403d2644f8c4..02f34e8e000cfab9573a4313183df87d782a9772 100644
Binary files a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getMetrics_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getMetrics_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..24662c288cbce5bf887e373e1489802fb2f91413
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getMetrics_day.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>43</revenue>
+ <conversion_rate>100%</conversion_rate>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
index 24662c288cbce5bf887e373e1489802fb2f91413..05d799d99b998fe750264b49cc891dfedcc4bb0c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>43</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>42</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>1</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>1</revenue_returning_visit>
+ <conversion_rate_returning_visit>100%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
index 48dfee4e720d2eec7e211606f75b7fc5b1675d5f..d851d2b9815206f78aeaf467cbb4c35d91b3c0b1 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
@@ -20,6 +20,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
index b1d887f466c0c0e91d19293da2cad5bbda8eb0a1..09f25d025fa558c3d61dfa4903a330c68b9f4016 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
@@ -18,6 +18,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
index 129e48b7e9ca3356f670f04377270733cb89d11e..81cdb9f555a17dab545eb4262133307a265ac1f0 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
@@ -5,6 +5,10 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>10</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>2</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
</result>
<result idSite="2" />
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
index 7268853bb5e9ebaef0aebf51bfce8ab6f14b746b..614d85d722b015bfeec9bcfcefe724608d73cb67 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
@@ -5,11 +5,23 @@
<nb_visits_converted>10</nb_visits_converted>
<revenue>50</revenue>
<conversion_rate>90.91%</conversion_rate>
+ <nb_conversions_new_visit>2</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>12</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>8</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>40</revenue_returning_visit>
+ <conversion_rate_returning_visit>88.89%</conversion_rate_returning_visit>
</result>
<result idSite="2">
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
</result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
index 12226c72f5603909061de6dbe1738d57e1d79a87..2af205614bb806393814edd742a0ea8145627c7d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
@@ -5,6 +5,10 @@
<nb_visits_converted>0</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>0%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
</result>
<result idSite="2" />
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
index 6a8828287783356f2fc8a8b7c628980d2798e03c..b43beb96314b52ea44c93656c948c972c0890b9f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
@@ -5,11 +5,23 @@
<nb_visits_converted>0</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>0%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
<result idSite="2">
<nb_conversions>0</nb_conversions>
<nb_visits_converted>0</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>0%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
</result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 49c645a098c9ee47d1f8f70bd6b86b39e4c6785c..fb730875c9d02d52ee72d2933f7d75f08564e220 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -20,6 +20,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index 85d83e021f4546bf315cea0f07d0f0e39871aa94..abcda7ca416ff65f3e1f8e7895460b5c594918c4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -313,26 +313,26 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
Unknown,8,40,0%,5,00:15:01,0%
Desktop,3,3,0%,1,00:00:00,100%
-Device brand
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,11,43,0%,3.9,00:10:55,27%
-
Visitor Browser
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,8,40,0%,5,00:15:01,0%
Firefox,2,2,0%,1,00:00:00,100%
Opera,1,1,0%,1,00:00:00,100%
-Browser version
+Device brand
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Firefox 3.6,2,2,0%,1,00:00:00,100%
-Opera 9.63,1,1,0%,1,00:00:00,100%
+Unknown,11,43,0%,3.9,00:10:55,27%
Device model
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,11,43,0%,3.9,00:10:55,27%
+Browser version
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,8,40,0%,5,00:15:01,0%
+Firefox 3.6,2,2,0%,1,00:00:00,100%
+Opera 9.63,1,1,0%,1,00:00:00,100%
+
Operating System families
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,8,40,0%,5,00:15:01,0%
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index e727da4cbf763eec3c371c124cf64ff855c8161e..1144a32df2d690e4894ab370a74d69444a4afdb2 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -273,11 +273,6 @@
<a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(13,13,13);">
Device type
</a>
- </li>
- <li>
- <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
- Device brand
- </a>
</li>
<li>
<a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);">
@@ -285,14 +280,19 @@
</a>
</li>
<li>
- <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(13,13,13);">
- Browser version
+ <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
+ Device brand
</a>
</li>
<li>
<a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);">
Device model
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(13,13,13);">
+ Browser version
+ </a>
</li>
<li>
<a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(13,13,13);">
@@ -4520,8 +4520,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Device brand
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Visitor Browser
</h2>
@@ -4529,7 +4529,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Device brand
+ Browser
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -4554,23 +4554,73 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
+ <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
Unknown </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 11
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 43
+ 40
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 3.9
+ 5
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:10:55
+ 00:15:01
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 27%
+ 0%
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 0%
+ </td>
+ </tr>
+
+ <tr style=";line-height: 22px;">
+ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
+
+ Firefox </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 2
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 2
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 1
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 00:00:00
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 100%
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 0%
+ </td>
+ </tr>
+
+ <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
+
+ Opera </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 1
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 1
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 1
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 00:00:00
+ </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4582,8 +4632,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Visitor Browser
+<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Device brand
</h2>
@@ -4591,7 +4641,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Browser
+ Device brand
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -4616,73 +4666,83 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/browsers/UNK.gif'>
+ <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
Unknown </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 40
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 5
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:15:01
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
-
- <tr style=";line-height: 22px;">
- <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
-
- Firefox </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 11
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 43
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 3.9
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:00:00
+ 00:10:55
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 27%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
</td>
</tr>
-
+ </tbody>
+ </table>
+ <br/>
+ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
+ Back to top
+ </a>
+<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Device model
+</h2>
+
+
+
+ <table style="border-collapse:collapse; margin-left: 5px;">
+ <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Device model
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Visits
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Actions
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Actions per Visit
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Avg. Time on Website
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Bounce Rate
+ </th>
+ <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
+ Conversion Rate
+ </th>
+ </thead>
+ <tbody>
+
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/browsers/OP.gif'>
-
- Opera </td>
+ Unknown </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 11
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 43
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 3.9
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:00:00
+ 00:10:55
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 27%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4806,66 +4866,6 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Device model
-</h2>
-
-
-
- <table style="border-collapse:collapse; margin-left: 5px;">
- <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Device model
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Visits
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions per Visit
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Avg. Time on Website
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Bounce Rate
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Conversion Rate
- </th>
- </thead>
- <tbody>
-
- <tr style="background-color: rgb(242,242,242);line-height: 22px;">
- <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Unknown </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 11
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 43
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 3.9
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:10:55
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 27%
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
- Back to top
- </a>
<h2 id="DevicesDetection_getOsFamilies" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
Operating System families
</h2>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
index b7555aa8c6690ec0cfd35641d335e2ce69007f1c..c61ad5dc70453929798ad1fd9cf18316b091ba7b 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>50%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>50%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
index c495e000706fde2ee1eb12404cfcbaf37b9dbb24..813c7c32796428591e12289f889c37c2bda18f9b 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
@@ -16,6 +16,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
index 3d396ecdb8c26d8231922c16c8da272256e49cd3..1b05d735d9e8013646f07174e215fb65d52c729c 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
@@ -18,6 +18,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index f99993804a0c78d8fbd8e70153580f955e29ac11..73239e096471be19ab35f65c80157411ac34773f 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -114,6 +114,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -149,6 +153,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -178,6 +186,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -206,6 +218,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -255,6 +271,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -283,6 +303,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -311,6 +335,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1044,6 +1072,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1080,6 +1112,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1108,6 +1144,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1144,6 +1184,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1180,6 +1224,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1216,6 +1264,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1252,6 +1304,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1505,6 +1561,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1538,6 +1598,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1571,6 +1635,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1604,6 +1672,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1639,6 +1711,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1767,6 +1843,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1795,6 +1875,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1808,11 +1892,10 @@
</row>
<row>
<category>Visitor Devices</category>
- <name>Visitor Browser</name>
+ <name>Device brand</name>
<module>DevicesDetection</module>
- <action>getBrowsers</action>
- <dimension>Browser</dimension>
- <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
+ <action>getBrand</action>
+ <dimension>Device brand</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1824,6 +1907,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1831,16 +1918,17 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrowsers</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>DevicesDetection_getBrand</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
- <name>Device brand</name>
+ <name>Visitor Browser</name>
<module>DevicesDetection</module>
- <action>getBrand</action>
- <dimension>Device brand</dimension>
+ <action>getBrowsers</action>
+ <dimension>Browser</dimension>
+ <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1852,6 +1940,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1859,16 +1951,16 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrand</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>DevicesDetection_getBrowsers</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
- <name>Device model</name>
+ <name>Browser version</name>
<module>DevicesDetection</module>
- <action>getModel</action>
- <dimension>Device model</dimension>
+ <action>getBrowserVersions</action>
+ <dimension>Browser version</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1880,6 +1972,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1887,16 +1983,16 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getModel</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
- <name>Browser version</name>
+ <name>Device model</name>
<module>DevicesDetection</module>
- <action>getBrowserVersions</action>
- <dimension>Browser version</dimension>
+ <action>getModel</action>
+ <dimension>Device model</dimension>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1908,6 +2004,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1915,9 +2015,9 @@
<bounce_rate>Bounce Rate</bounce_rate>
<conversion_rate>Conversion Rate</conversion_rate>
</processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>DevicesDetection_getBrowserVersions</uniqueId>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+ <uniqueId>DevicesDetection_getModel</uniqueId>
</row>
<row>
<category>Visitor Devices</category>
@@ -1936,6 +2036,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1964,6 +2068,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -1993,6 +2101,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
index 57438262e45ccde6b3c03972467c0b678a74a62b..375235eaa5158063534ddfc6de9dd95b278d98ce 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
@@ -18,6 +18,15 @@
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>42.26</revenue>
+ <conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>42.26</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
<nb_pageviews>1</nb_pageviews>
<nb_uniq_pageviews>1</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
@@ -26,7 +35,6 @@
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <conversion_rate>100%</conversion_rate>
<bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>1086</avg_time_on_site>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
index c751366bfde686a8aa0eef1c280b0485eb200c1e..75bcc851e28a3a908c260cf90d777f43ebf5b5c0 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
@@ -18,6 +18,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
index f371029f1ba3f9fef9137bad8bd51f8a8a49142f..4dc81bdddadaec474074fd2f0bd1e3865035a594 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
@@ -17,6 +17,10 @@
<nb_visits>Si un visiteur se rend sur votre site web pour la première fois ou s'il visite une page plus de 30 minutes après sa dernière page, il sera enregistré en tant que nouvelle visite.</nb_visits>
<nb_uniq_visitors>Nombre de visiteurs uniques visitant votre site web. Chaque utilisateur n'est compté qu'une seule fois, même s'il visite le site plusieurs fois dans la journée.</nb_uniq_visitors>
<nb_actions>Nombre d'actions effectuées par vos visiteurs. Les actions peuvent être des visites de pages, téléchargements, liens sortants.</nb_actions>
+ <nb_actions_per_visit>Nombre moyen d'actions (affichages de page, téléchargements ou liens sortants) qui ont été effectuées durant les visites.</nb_actions_per_visit>
+ <avg_time_on_site>Durée moyenne d'une visite</avg_time_on_site>
+ <bounce_rate>Pourcentage de visites qui ont eu un affichage unique de page. Cela signifie que le visiteur a quitté le site directement depuis la page d'entrée.</bounce_rate>
+ <conversion_rate>Pourcentage de visites qui ont déclenché une conversion en Objectif.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions par visite</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
index b82a3a8c27357b3f08c904d458610467cac4c4b0..72c57859f35f129033ba175eac7f03ebc599bbc8 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
@@ -6,4 +6,16 @@
<items>8</items>
<avg_order_revenue>2510.11</avg_order_revenue>
<conversion_rate>66.67%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <items_new_visit>0</items_new_visit>
+ <avg_order_revenue_new_visit>0</avg_order_revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>2</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>2</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>5020.22</revenue_returning_visit>
+ <items_returning_visit>8</items_returning_visit>
+ <avg_order_revenue_returning_visit>2510.11</avg_order_revenue_returning_visit>
+ <conversion_rate_returning_visit>100%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
index e69257b0fa67752622395912e07aaa70473881f3..b174b63a6f728523a9a9bb7e5f9d5505b8406b94 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
@@ -6,4 +6,16 @@
<items>12</items>
<avg_order_revenue>2510.11</avg_order_revenue>
<conversion_rate>60%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <items_new_visit>0</items_new_visit>
+ <avg_order_revenue_new_visit>0</avg_order_revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>3</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>7530.33</revenue_returning_visit>
+ <items_returning_visit>12</items_returning_visit>
+ <avg_order_revenue_returning_visit>2510.11</avg_order_revenue_returning_visit>
+ <conversion_rate_returning_visit>75%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
index 1245b5cd8f33fb084d5ddfcf9a00bf42fdd3ecbd..bbfbfc601c16c8c7f1290f4b6b31cd28b07f03c7 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>10</revenue>
<conversion_rate>33.33%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
index b5daa8ba92cc3f64b18178b6a3a1888f17cc94e1..9c1f47244abe53bd93d138b3d33a1868f02370e1 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>10</revenue>
<conversion_rate>20%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
index b1c28a0a8dae1db860166cbf472052fe21c88173..028c95e9471110ff8956e8803b721cd00a0f9917 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
@@ -10,4 +10,24 @@
<items>10</items>
<avg_order_revenue>1555.56</avg_order_revenue>
<conversion_rate>33.33%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <revenue_subtotal_new_visit>0</revenue_subtotal_new_visit>
+ <revenue_tax_new_visit>0</revenue_tax_new_visit>
+ <revenue_shipping_new_visit>0</revenue_shipping_new_visit>
+ <revenue_discount_new_visit>0</revenue_discount_new_visit>
+ <items_new_visit>0</items_new_visit>
+ <avg_order_revenue_new_visit>0</avg_order_revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>2</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>3111.11</revenue_returning_visit>
+ <revenue_subtotal_returning_visit>2500</revenue_subtotal_returning_visit>
+ <revenue_tax_returning_visit>511</revenue_tax_returning_visit>
+ <revenue_shipping_returning_visit>100.11</revenue_shipping_returning_visit>
+ <revenue_discount_returning_visit>666</revenue_discount_returning_visit>
+ <items_returning_visit>10</items_returning_visit>
+ <avg_order_revenue_returning_visit>1555.56</avg_order_revenue_returning_visit>
+ <conversion_rate_returning_visit>50%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
index 92abb4962b54fa8c51c6a498b90dc9cd42ad4724..2f03fafa0562c90f41dbfce203e1ca3184e0a8a2 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
@@ -10,4 +10,24 @@
<items>12</items>
<avg_order_revenue>3337.78</avg_order_revenue>
<conversion_rate>40%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <revenue_subtotal_new_visit>0</revenue_subtotal_new_visit>
+ <revenue_tax_new_visit>0</revenue_tax_new_visit>
+ <revenue_shipping_new_visit>0</revenue_shipping_new_visit>
+ <revenue_discount_new_visit>0</revenue_discount_new_visit>
+ <items_new_visit>0</items_new_visit>
+ <avg_order_revenue_new_visit>0</avg_order_revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>4</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>2</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>13351.11</revenue_returning_visit>
+ <revenue_subtotal_returning_visit>2700</revenue_subtotal_returning_visit>
+ <revenue_tax_returning_visit>531</revenue_tax_returning_visit>
+ <revenue_shipping_returning_visit>120.11</revenue_shipping_returning_visit>
+ <revenue_discount_returning_visit>686</revenue_discount_returning_visit>
+ <items_returning_visit>12</items_returning_visit>
+ <avg_order_revenue_returning_visit>3337.78</avg_order_revenue_returning_visit>
+ <conversion_rate_returning_visit>50%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
index 837cc2b4c663c5f6b3ad4a284008ae25fe26295c..08432554eec70c97ac422dde3cec11b72c2d7de1 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>3121.11</revenue>
<conversion_rate>66.67%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>2</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>3111.11</revenue_returning_visit>
+ <conversion_rate_returning_visit>50%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
index c9cd54530d69634e9ddb7577a30a38a16528509b..6c6dacbd815b4e441eb3d68163af16a32faf7fd0 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>4</nb_visits_converted>
<revenue>13361.11</revenue>
<conversion_rate>80%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>4</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>13351.11</revenue_returning_visit>
+ <conversion_rate_returning_visit>75%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
index b98d7db734e45007d717882257e8765d7dfdf9a5..a0a7bbea543be3cfd1b6939e27ed31e214420212 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
@@ -20,6 +20,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
index 2cb7df5a9ebb487bf6f925832c407ac95331e313..36db013c1a9aafbc3ed08f31d7f0fd697f02a236 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>0</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>0%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
index 8405e1d37a77bffd95f7879497e268b1b0bb7415..6306af1f2b352056abc37241d929a54c5994b589 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>10</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
index 8405e1d37a77bffd95f7879497e268b1b0bb7415..6306af1f2b352056abc37241d929a54c5994b589 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>10</revenue>
<conversion_rate>100%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
index 76d1b80343b7a8e458e7066c56066fbc0fbfaa81..92c011eff0a354475dfc633e56c00aa8d5998734 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>1</nb_visits_converted>
<revenue>250</revenue>
<conversion_rate>50%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>250</revenue_new_visit>
+ <conversion_rate_new_visit>50%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
index 95ecfbfd3cb490904a64d278c092e545e58119aa..3d36e8c07555e4dc1e8f823d432c384281b60c30 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
@@ -18,6 +18,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
index 837cc2b4c663c5f6b3ad4a284008ae25fe26295c..08432554eec70c97ac422dde3cec11b72c2d7de1 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>3121.11</revenue>
<conversion_rate>66.67%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>2</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>3111.11</revenue_returning_visit>
+ <conversion_rate_returning_visit>50%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
index c9cd54530d69634e9ddb7577a30a38a16528509b..6c6dacbd815b4e441eb3d68163af16a32faf7fd0 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>4</nb_visits_converted>
<revenue>13361.11</revenue>
<conversion_rate>80%</conversion_rate>
+ <nb_conversions_new_visit>1</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
+ <revenue_new_visit>10</revenue_new_visit>
+ <conversion_rate_new_visit>100%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>4</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>13351.11</revenue_returning_visit>
+ <conversion_rate_returning_visit>75%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index c01bf08c71586985aa82df699723405aec174e8c..dc3af2db1ae150219bd8ec87500950f1c4ac5bfd 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -470,15 +470,11 @@ Device type
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Desktop,5,16,80%,3.2,00:22:49,20%
-Device brand
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,5,16,80%,3.2,00:22:49,20%
-
Visitor Browser
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Firefox,5,16,80%,3.2,00:22:49,20%
-Device model
+Device brand
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Unknown,5,16,80%,3.2,00:22:49,20%
@@ -486,6 +482,10 @@ Browser version
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Firefox 3.6,5,16,80%,3.2,00:22:49,20%
+Device model
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Unknown,5,16,80%,3.2,00:22:49,20%
+
Operating System families
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
Windows,5,16,80%,3.2,00:22:49,20%
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index c77997e4ca3398793f766da1eee9bd8fa9df7df9..eed4308fdec7408812ad3ed4a602e743b22a459a 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -333,11 +333,6 @@
<a href="#DevicesDetection_getType" style="text-decoration:none; color: rgb(13,13,13);">
Device type
</a>
- </li>
- <li>
- <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
- Device brand
- </a>
</li>
<li>
<a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);">
@@ -345,14 +340,19 @@
</a>
</li>
<li>
- <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);">
- Device model
+ <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);">
+ Device brand
</a>
</li>
<li>
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(13,13,13);">
Browser version
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);">
+ Device model
+ </a>
</li>
<li>
<a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(13,13,13);">
@@ -6182,8 +6182,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Device brand
+<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Visitor Browser
</h2>
@@ -6191,7 +6191,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Device brand
+ Browser
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -6216,9 +6216,9 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
- Unknown </td>
+ Firefox </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
5
</td>
@@ -6244,8 +6244,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Visitor Browser
+<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Device brand
</h2>
@@ -6253,7 +6253,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Browser
+ Device brand
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -6278,9 +6278,9 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
+ <img src='plugins/DevicesDetection/images/brand/Unknown.ico'>
- Firefox </td>
+ Unknown </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
5
</td>
@@ -6306,8 +6306,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Device model
+<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Browser version
</h2>
@@ -6315,7 +6315,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Device model
+ Browser version
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -6340,7 +6340,9 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Unknown </td>
+ <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
+
+ Firefox 3.6 </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
5
</td>
@@ -6366,8 +6368,8 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Browser version
+<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
+ Device model
</h2>
@@ -6375,7 +6377,7 @@
<table style="border-collapse:collapse; margin-left: 5px;">
<thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Browser version
+ Device model
</th>
<th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
Visits
@@ -6400,9 +6402,7 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <img src='plugins/DevicesDetection/images/browsers/FF.gif'>
-
- Firefox 3.6 </td>
+ Unknown </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
5
</td>
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..106f23f16bb7dddc98ac7def1dd2c59d64a48127
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_day.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="2009-01-04" />
+ <result date="2009-01-05" />
+ <result date="2009-01-06" />
+ <result date="2009-01-07" />
+ <result date="2009-01-08" />
+ <result date="2009-01-09" />
+ <result date="2009-01-10" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_week.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cfb246edc18a6da402cb45044dfaf1ad20e25bc
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getMetrics_week.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+ <result date="From 2008-12-29 to 2009-01-04" />
+ <result date="From 2009-01-05 to 2009-01-11" />
+ <result date="From 2009-01-12 to 2009-01-18" />
+ <result date="From 2009-01-19 to 2009-01-25" />
+ <result date="From 2009-01-26 to 2009-02-01" />
+ <result date="From 2009-02-02 to 2009-02-08" />
+ <result date="From 2009-02-09 to 2009-02-15" />
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Goals.getMetrics_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getMetrics_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2cb7df5a9ebb487bf6f925832c407ac95331e313
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getMetrics_day.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>0</nb_conversions>
+ <nb_visits_converted>0</nb_visits_converted>
+ <revenue>0</revenue>
+ <conversion_rate>0%</conversion_rate>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
index 2cb7df5a9ebb487bf6f925832c407ac95331e313..36db013c1a9aafbc3ed08f31d7f0fd697f02a236 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>0</nb_visits_converted>
<revenue>0</revenue>
<conversion_rate>0%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>0%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index f704570bac3463e4f4e45d1982af23c4bb841029..61d15c6685b9b57a3c4ec4ae8f10cd06075d29b3 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
@@ -17,6 +17,10 @@
<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
index 26bf6746c5f25220c8cc1e7f9eaf916f12783e5f..2c07daa5b110cae7c965a4232d049fcb3b6c8550 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
@@ -4,4 +4,12 @@
<nb_visits_converted>2</nb_visits_converted>
<revenue>1000</revenue>
<conversion_rate>66.67%</conversion_rate>
+ <nb_conversions_new_visit>3</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit>
+ <revenue_new_visit>1000</revenue_new_visit>
+ <conversion_rate_new_visit>66.67%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index f1debe8ad2a29c0d8cd9483e29c1474bfd1fd0c4..1b02f126e5d99b84e6756115724702c333497064 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -154,7 +154,6 @@
-
</row>
<row>
<idSite>1</idSite>
@@ -275,7 +274,6 @@
-
</row>
</lastVisits>
<userId>0</userId>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..61d15c6685b9b57a3c4ec4ae8f10cd06075d29b3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <website>Piwik test</website>
+
+ <metadata>
+ <category>Visitors</category>
+ <name>Country</name>
+ <module>UserCountry</module>
+ <action>getCountry</action>
+ <dimension>Country</dimension>
+ <documentation>This report shows which country your visitors were in when they accessed your website.</documentation>
+ <metrics>
+ <nb_visits>Visits</nb_visits>
+ <nb_actions>Actions</nb_actions>
+ </metrics>
+ <metricsDocumentation>
+ <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
+ <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
+ <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
+ </metricsDocumentation>
+ <processedMetrics>
+ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+ <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
+ <bounce_rate>Bounce Rate</bounce_rate>
+ </processedMetrics>
+ <metricsGoal>
+ <nb_conversions>Conversions</nb_conversions>
+ <revenue>Revenue</revenue>
+ </metricsGoal>
+ <processedMetricsGoal>
+ <revenue_per_visit>Revenue per Visit</revenue_per_visit>
+ </processedMetricsGoal>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=range&date=</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=day&date=</imageGraphEvolutionUrl>
+ <uniqueId>UserCountry_getCountry</uniqueId>
+ </metadata>
+ <columns>
+ <label>Country</label>
+ <nb_visits>Visits</nb_visits>
+ <nb_actions>Actions</nb_actions>
+ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+ <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
+ <bounce_rate>Bounce Rate</bounce_rate>
+ <revenue>Revenue</revenue>
+ </columns>
+ <reportData>
+ <row>
+ <label>France</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>5</nb_actions>
+ <revenue>$ 1000</revenue>
+ <nb_actions_per_visit>1.7</nb_actions_per_visit>
+ <avg_time_on_site>00:04:02</avg_time_on_site>
+ <bounce_rate>67%</bounce_rate>
+ </row>
+ </reportData>
+ <reportMetadata>
+ <row>
+ <code>fr</code>
+ <logo>plugins/UserCountry/images/flags/fr.png</logo>
+ <segment>countryCode==fr</segment>
+ <logoWidth>16</logoWidth>
+ <logoHeight>11</logoHeight>
+ </row>
+ </reportMetadata>
+ <reportTotal>
+ <nb_visits>3</nb_visits>
+ <nb_actions>5</nb_actions>
+ <nb_conversions>3</nb_conversions>
+ <bounce_count>2</bounce_count>
+ <revenue>1000</revenue>
+ </reportTotal>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..457accfc9ace96ea6d6c5ea72827bd2ab69718ef
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Actions.getPageUrls_range.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>/homepage</label>
+ <nb_visits>2</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>360</sum_time_spent>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
+ <entry_sum_visit_length>364</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <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>180</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>50%</exit_rate>
+ <url>http://example.org/homepage</url>
+ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fhomepage</segment>
+ </row>
+ <row>
+ <label>user</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <subtable>
+ <row>
+ <label>/profile</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <url>http://example.org/user/profile</url>
+ </row>
+ </subtable>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1639c238a3456e0fafbd920e572f0c468bc3f9cb
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>VisitorType</label>
+ <nb_visits>3</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>725</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>3</nb_conversions>
+ <revenue>1000</revenue>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <subtable>
+ <row>
+ <label>LoggedIn</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>0</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
+ <label>LoggedOut</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>361</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>1000</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>SET WITH EMPTY VALUE</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>0</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <subtable>
+ <row>
+ <label>Value not defined</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>0</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>Value will be VERY long and truncated</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>0</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <subtable>
+ <row>
+ <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>0</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>361</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>1000</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <subtable>
+ <row>
+ <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>361</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>1000</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>Language</label>
+ <nb_actions>1</nb_actions>
+ <subtable>
+ <row>
+ <label>FR</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+ <nb_actions>1</nb_actions>
+ <subtable>
+ <row>
+ <label>Value not defined</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c31484a079d07c5d6441e733afe91465862dc559
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_conversions>3</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>1000</revenue>
+ <conversion_rate>66.67%</conversion_rate>
+ <nb_conversions_new_visit>0</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>2</nb_visits_converted_new_visit>
+ <revenue_new_visit>0</revenue_new_visit>
+ <conversion_rate_new_visit>66.67%</conversion_rate_new_visit>
+ <nb_conversions_returning_visit>0</nb_conversions_returning_visit>
+ <nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
+ <revenue_returning_visit>0</revenue_returning_visit>
+ <conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getCounters.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getCounters.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba6489a54cde26c534678d769058370621777603
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getCounters.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <visits>3</visits>
+ <actions>5</actions>
+ <visitors>2</visitors>
+ <visitsConverted>3</visitsConverted>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml
new file mode 100644
index 0000000000000000000000000000000000000000..121f02c75a7900e7053a5bba55c036b6a440d0b7
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>3</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>outlink</type>
+ <url>http://test.com</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>5</pageId>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/homepage</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/homepage</url>
+ <pageTitle>Homepage</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>4</pageId>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>361</visitDuration>
+ <visitDurationPretty>6 min 1s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>second goal</goalName>
+ <goalId>2</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/homepage</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/homepage</url>
+ <pageTitle>Homepage</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <timeSpent>360</timeSpent>
+ <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <icon />
+
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/user/profile</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/user/profile</url>
+ <pageTitle>Profile page</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+ <pageId>2</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName4>Status user</customVariablePageName4>
+ <customVariablePageValue4>Loggedin</customVariablePageValue4>
+ </row>
+ <row>
+ <customVariablePageName5>Status user</customVariablePageName5>
+ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5>
+ </row>
+ </customVariables>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/user/profile</url>
+ <pageTitle>Profile page for user *_)%</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+ <pageId>3</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>Language</customVariablePageName1>
+ <customVariablePageValue1>FR</customVariablePageValue1>
+ </row>
+ <row>
+ <customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
+ <customVariablePageValue2 />
+ </row>
+ <row>
+ <customVariablePageName4>Status user</customVariablePageName4>
+ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4>
+ </row>
+ </customVariables>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>2</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>364</visitDuration>
+ <visitDurationPretty>6 min 4s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>3</actions>
+ <referrerType>search</referrerType>
+ <referrerTypeName>Search Engines</referrerTypeName>
+ <referrerName>Google</referrerName>
+ <referrerKeyword>this keyword should be ranked</referrerKeyword>
+ <referrerKeywordPosition>1</referrerKeywordPosition>
+ <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedIn</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
+ <customVariableValue2 />
+ </row>
+ <row>
+ <customVariableName3>Value will be VERY long and truncated</customVariableName3>
+ <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..121f02c75a7900e7053a5bba55c036b6a440d0b7
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>3</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>outlink</type>
+ <url>http://test.com</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>5</pageId>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/homepage</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/homepage</url>
+ <pageTitle>Homepage</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>4</pageId>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>361</visitDuration>
+ <visitDurationPretty>6 min 1s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>1</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>second goal</goalName>
+ <goalId>2</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/homepage</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/homepage</url>
+ <pageTitle>Homepage</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>1</pageId>
+ <timeSpent>360</timeSpent>
+ <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <icon />
+
+ </row>
+ <row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/user/profile</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/user/profile</url>
+ <pageTitle>Profile page</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+ <pageId>2</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName4>Status user</customVariablePageName4>
+ <customVariablePageValue4>Loggedin</customVariablePageValue4>
+ </row>
+ <row>
+ <customVariablePageName5>Status user</customVariablePageName5>
+ <customVariablePageValue5>looking at "profile page"</customVariablePageValue5>
+ </row>
+ </customVariables>
+ <timeSpent>0</timeSpent>
+ <timeSpentPretty>0s</timeSpentPretty>
+ <icon />
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/user/profile</url>
+ <pageTitle>Profile page for user *_)%</pageTitle>
+ <pageIdAction>4</pageIdAction>
+
+ <pageId>3</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>Language</customVariablePageName1>
+ <customVariablePageValue1>FR</customVariablePageValue1>
+ </row>
+ <row>
+ <customVariablePageName2>SET WITH EMPTY VALUE PAGE SCOPE</customVariablePageName2>
+ <customVariablePageValue2 />
+ </row>
+ <row>
+ <customVariablePageName4>Status user</customVariablePageName4>
+ <customVariablePageValue4>looking at "profile page"</customVariablePageValue4>
+ </row>
+ </customVariables>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>2</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>364</visitDuration>
+ <visitDurationPretty>6 min 4s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>3</actions>
+ <referrerType>search</referrerType>
+ <referrerTypeName>Search Engines</referrerTypeName>
+ <referrerName>Google</referrerName>
+ <referrerKeyword>this keyword should be ranked</referrerKeyword>
+ <referrerKeywordPosition>1</referrerKeywordPosition>
+ <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+ <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.6</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedIn</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>SET WITH EMPTY VALUE</customVariableName2>
+ <customVariableValue2 />
+ </row>
+ <row>
+ <customVariableName3>Value will be VERY long and truncated</customVariableName3>
+ <customVariableValue3>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</customVariableValue3>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getMostRecentVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getMostRecentVisitorId.xml
new file mode 100644
index 0000000000000000000000000000000000000000..943e78b64e72250f291f56816ebd13224eb0f3eb
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getMostRecentVisitorId.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>61e8cc2d51fea26d</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1b02f126e5d99b84e6756115724702c333497064
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <totalVisits>2</totalVisits>
+ <totalVisitDuration>361</totalVisitDuration>
+ <totalActions>2</totalActions>
+ <totalSearches>0</totalSearches>
+ <totalPageViewsWithTiming>0</totalPageViewsWithTiming>
+ <totalGoalConversions>1</totalGoalConversions>
+ <totalConversionsByGoal>
+ <row idgoal="1">1</row>
+ </totalConversionsByGoal>
+ <hasLatLong>0</hasLatLong>
+ <searches>
+ </searches>
+ <continents>
+ <row>
+ <continent>eur</continent>
+ <nb_visits>2</nb_visits>
+ <prettyName>Europe</prettyName>
+ </row>
+ </continents>
+ <countries>
+ <row>
+ <country>fr</country>
+ <nb_visits>2</nb_visits>
+ <flag>plugins/UserCountry/images/flags/fr.png</flag>
+ <prettyName>France</prettyName>
+ </row>
+ </countries>
+ <totalVisitDurationPretty>6 min 1s</totalVisitDurationPretty>
+ <firstVisit>
+
+
+ <daysAgo>0</daysAgo>
+ <referrerType>direct</referrerType>
+ <referralSummary>Direct Entry</referralSummary>
+ </firstVisit>
+ <lastVisit>
+
+
+ <daysAgo>0</daysAgo>
+ <referrerType>direct</referrerType>
+ <referralSummary>Direct Entry</referralSummary>
+ </lastVisit>
+ <visitsAggregated>2</visitsAggregated>
+
+
+ <lastVisits>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>3</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>outlink</type>
+ <url>http://test.com</url>
+ <pageTitle />
+ <pageIdAction>6</pageIdAction>
+
+ <pageId>5</pageId>
+ <icon>plugins/Morpheus/images/link.gif</icon>
+
+ </row>
+ </actionDetails>
+ <goalConversions>0</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>0</visitConverted>
+ <visitConvertedIcon />
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
+ <idVisit>2</idVisit>
+ <visitIp>156.5.3.2</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>triggered js</goalName>
+ <goalId>1</goalId>
+ <revenue>0</revenue>
+ <goalPageId />
+
+ <url>http://example.org/homepage</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/homepage</url>
+ <pageTitle>Homepage</pageTitle>
+ <pageIdAction>2</pageIdAction>
+
+ <pageId>4</pageId>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>361</visitDuration>
+ <visitDurationPretty>6 min 1s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <deviceType>Desktop</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon>
+ <deviceBrand>Unknown</deviceBrand>
+ <deviceModel />
+ <operatingSystem>Windows XP</operatingSystem>
+ <operatingSystemName>Windows</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon>
+ <operatingSystemCode>WIN</operatingSystemCode>
+ <operatingSystemVersion>XP</operatingSystemVersion>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
+ <browserCode>FF</browserCode>
+ <browserVersion>3.0</browserVersion>
+ <events>0</events>
+ <continent>Europe</continent>
+ <continentCode>eur</continentCode>
+ <country>France</country>
+ <countryCode>fr</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <region />
+ <regionCode />
+ <city />
+ <location>France</location>
+ <latitude />
+ <longitude />
+ <visitLocalTime>12:34:06</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <provider>Unknown</provider>
+ <providerName>Unknown</providerName>
+ <providerUrl />
+ <customVariables>
+ <row>
+ <customVariableName1>VisitorType</customVariableName1>
+ <customVariableValue1>LoggedOut</customVariableValue1>
+ </row>
+ <row>
+ <customVariableName2>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</customVariableName2>
+ <customVariableValue2>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</customVariableValue2>
+ </row>
+ </customVariables>
+ <resolution>1111x222</resolution>
+ <plugins>flash, java</plugins>
+ <pluginsIcons>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+ <pluginName>flash</pluginName>
+ </row>
+ <row>
+ <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+ <pluginName>java</pluginName>
+ </row>
+ </pluginsIcons>
+
+
+
+
+
+ </row>
+ </lastVisits>
+ <userId>0</userId>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getCampaigns_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getCampaigns_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..566315146e79b486198e015cb26516e36a6aa0b3
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getCampaigns_range.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>campaign name - yeah!</label>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>1000</revenue>
+ <nb_visits>0</nb_visits>
+ <segment>referrerType==campaign;referrerName==campaign+name+-+yeah%21</segment>
+ <subtable>
+ <row>
+ <label>campaign keyword - right...</label>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>1000</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>1000</revenue>
+ <nb_visits>0</nb_visits>
+ </row>
+ </subtable>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getKeywords_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..418287bdef12bd491441355c76e07699a31bf02e
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Referrers.getKeywords_range.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>
+ <label>this keyword should be ranked</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerType==search;referrerKeyword==this+keyword+should+be+ranked</segment>
+ <subtable>
+ <row>
+ <label>Google</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>364</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ </subtable>
+ </row>
+ <row>
+ <label>piwik</label>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ <row idgoal='2'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>0</revenue>
+ </row>
+ </goals>
+ <nb_conversions>2</nb_conversions>
+ <revenue>0</revenue>
+ <nb_visits>0</nb_visits>
+ <segment>referrerType==search;referrerKeyword==piwik</segment>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4a5151e91296dd2e56889194a0ee73970370364c
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_visits>3</nb_visits>
+ <nb_actions>5</nb_actions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <bounce_count>2</bounce_count>
+ <sum_visit_length>725</sum_visit_length>
+ <max_actions>3</max_actions>
+ <bounce_rate>67%</bounce_rate>
+ <nb_actions_per_visit>1.7</nb_actions_per_visit>
+ <avg_time_on_site>242</avg_time_on_site>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index 5712088ac85ac8e3b6b2ef444a4e0e6e234a5a51..87b6e8279994d6f1e81a8faa7ae14f639b847402 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -21,6 +21,10 @@
<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+ <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+ <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+ <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+ <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
</metricsDocumentation>
<processedMetrics>
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>