diff options
66 files changed, 624 insertions, 1336 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a939cbb21..a3741a87be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)* * Public API class `Piwik\Plugins\CustomPiwikJs\TrackerUpdater` has been renamed to `Piwik\Plugins\CustomJsTracker\TrackerUpdater` * API method `CustomPiwikJs.doesIncludePluginTrackersAutomatically` has been renamed to `CustomJsTracker.doesIncludePluginTrackersAutomatically` * GeoIP Legacy support has been fully removed. Users of GeoIP Legacy need to set up a new location provider like GeoIP2, otherwise the default location provider will be used. +* Site search category and count are no longer stored as custom variables. That also means they will now have an extra field in action details and no longer appear in custom variables. ## Matomo 3.13.1 diff --git a/core/Columns/Discriminator.php b/core/Columns/Discriminator.php index 3cf1348b5b..8483217c1b 100644 --- a/core/Columns/Discriminator.php +++ b/core/Columns/Discriminator.php @@ -45,8 +45,7 @@ class Discriminator public function isValid() { - return isset($this->discriminatorColumn) - && (is_numeric($this->discriminatorValue) || $this->discriminatorValue == ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY); + return isset($this->discriminatorColumn) && is_numeric($this->discriminatorValue); } /** diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php index d1ea9f9602..c38b1a1eb5 100644 --- a/core/Updates/4.0.0-b1.php +++ b/core/Updates/4.0.0-b1.php @@ -50,6 +50,13 @@ class Updates_4_0_0_b1 extends PiwikUpdates $migrations[] = $this->migration->plugin->activate('CustomJsTracker'); } + // Move the site search fields of log_visit out of custom variables into their own fields + $migrations[] = $this->migration->db->addColumn('log_link_visit_action', 'search_cat', 'VARCHAR(200) NULL'); + $migrations[] = $this->migration->db->addColumn('log_link_visit_action', 'search_count', 'INTEGER(10) UNSIGNED NULL'); + $visitActionTable = Common::prefixTable('log_link_visit_action'); + $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_cat = custom_var_v4 WHERE custom_var_k4 = '_pk_scat'"); + $migrations[] = $this->migration->db->sql("UPDATE $visitActionTable SET search_count = custom_var_v5 WHERE custom_var_k5 = '_pk_scount'"); + if ($this->usesGeoIpLegacyLocationProvider()) { // activate GeoIp2 plugin for users still using GeoIp2 Legacy (others might have it disabled on purpose) $migrations[] = $this->migration->plugin->activate('GeoIp2'); diff --git a/plugins/API/API.php b/plugins/API/API.php index f84c95f443..299bfc2a50 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -748,7 +748,7 @@ class API extends \Piwik\Plugin\API { // If you update this, also update flattenVisitorDetailsArray $segmentsNeedActionsInfo = array('visitConvertedGoalId', - 'pageUrl', 'pageTitle', 'siteSearchKeyword', + 'pageUrl', 'pageTitle', 'siteSearchKeyword', 'siteSearchCategory', 'siteSearchCount', 'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl', 'outlinkUrl', 'downloadUrl', 'eventUrl', 'orderId' ); diff --git a/plugins/API/tests/Integration/RowEvolutionTest.php b/plugins/API/tests/Integration/RowEvolutionTest.php index 36675bcd39..1b50214131 100644 --- a/plugins/API/tests/Integration/RowEvolutionTest.php +++ b/plugins/API/tests/Integration/RowEvolutionTest.php @@ -40,11 +40,4 @@ class RowEvolutionTest extends IntegrationTestCase $table = $rowEvolution->getRowEvolution(1, 'day', 'last7', 'Actions', 'getPageUrls'); $this->assertNotEmpty($table); } - - public function test_getRowEvolution_shouldReturnEmptyArray_IfNoData() - { - $rowEvolution = new RowEvolution(); - $table = $rowEvolution->getRowEvolution(1, 'day', 'last7', 'Actions', 'getSiteSearchCategories'); - $this->assertEquals(array(), $table); - } } diff --git a/plugins/API/tests/System/AutoSuggestAPITest.php b/plugins/API/tests/System/AutoSuggestAPITest.php index 4d956d19a4..a84b020368 100644 --- a/plugins/API/tests/System/AutoSuggestAPITest.php +++ b/plugins/API/tests/System/AutoSuggestAPITest.php @@ -196,7 +196,7 @@ class AutoSuggestAPITest extends SystemTestCase public function testCheckOtherTestsWereComplete() { // Check that only a few haven't been tested specifically (these are all custom variables slots since we only test slot 1, 2, 5 (see the fixture) and example dimension slots and bandwidth) - $maximumSegmentsToSkip = 21; + $maximumSegmentsToSkip = 23; $this->assertLessThan($maximumSegmentsToSkip, count(self::$skipped), 'SKIPPED ' . count(self::$skipped) . ' segments --> some segments had no "auto-suggested values" but we should try and test the autosuggest for all new segments. Segments skipped were: ' . implode(', ', self::$skipped)); diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 2de8a6569f..c63cf7a08d 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -189,18 +189,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>48</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 48</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -964,18 +960,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>36</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 36</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -1768,18 +1760,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>24</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 24</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -2968,18 +2956,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>12</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 12</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -3213,18 +3197,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>12</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 12</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -5252,18 +5232,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>0</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -5526,18 +5502,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>0</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -5800,18 +5772,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>0</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -6066,18 +6034,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>0</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml index 522fc54866..c234bed59e 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row>Search Category</row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml index c26e714a25..769a3cf046 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml @@ -2,5 +2,4 @@ <result> <row>Cvar 2 PAGE name</row> <row>Cvar 5 PAGE name</row> - <row>Search Category</row> </result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml index f7624776eb..c234bed59e 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row>CAT</row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml index e20cde6740..eb1502c2fe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>CAT</row> <row>Cvar2 PAGE value is 0</row> <row>Cvar2 PAGE value is 1</row> <row>Cvar5 PAGE value is 0</row> diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml index 4be0b7b205..88dae8fd6c 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>9</nb_visits> - <nb_actions>45</nb_actions> - <nb_visits_converted>9</nb_visits_converted> - <bounce_count>0</bounce_count> - <sum_visit_length>14599</sum_visit_length> - <max_actions>5</max_actions> - <bounce_rate>0%</bounce_rate> - <nb_actions_per_visit>5</nb_actions_per_visit> - <avg_time_on_site>1622</avg_time_on_site> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <nb_visits_converted>4</nb_visits_converted> + <bounce_count>4</bounce_count> + <sum_visit_length>0</sum_visit_length> + <max_actions>1</max_actions> + <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCategory__API.getSuggestedValuesForSegment.xml index c234bed59e..f7624776eb 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCategory__API.getSuggestedValuesForSegment.xml @@ -1,2 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file +<result> + <row>CAT</row> +</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCategory__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCategory__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..4be0b7b205 --- /dev/null +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCategory__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>9</nb_visits> + <nb_actions>45</nb_actions> + <nb_visits_converted>9</nb_visits_converted> + <bounce_count>0</bounce_count> + <sum_visit_length>14599</sum_visit_length> + <max_actions>5</max_actions> + <bounce_rate>0%</bounce_rate> + <nb_actions_per_visit>5</nb_actions_per_visit> + <avg_time_on_site>1622</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..aad5e66529 --- /dev/null +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row>12</row> + <row>24</row> + <row>36</row> + <row>48</row> +</result>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__VisitsSummary.get_range.xml new file mode 100644 index 0000000000..4fcc0a92d6 --- /dev/null +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchCount__VisitsSummary.get_range.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <nb_visits_converted>2</nb_visits_converted> + <bounce_count>0</bounce_count> + <sum_visit_length>3242</sum_visit_length> + <max_actions>5</max_actions> + <bounce_rate>0%</bounce_rate> + <nb_actions_per_visit>5</nb_actions_per_visit> + <avg_time_on_site>1621</avg_time_on_site> +</result>
\ No newline at end of file diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index c0f107b954..d9b98c6cfb 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -20,8 +20,6 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime; use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage; use Piwik\Plugins\Actions\Columns\Metrics\BounceRate; use Piwik\Plugins\Actions\Columns\Metrics\ExitRate; -use Piwik\Plugins\CustomVariables\API as APICustomVariables; -use Piwik\Plugins\Actions\Actions\ActionSiteSearch; use Piwik\Plugin\ReportsProvider; use Piwik\Tracker\Action; use Piwik\Tracker\PageUrl; @@ -352,42 +350,13 @@ class API extends \Piwik\Plugin\API { Piwik::checkUserHasViewAccess($idSite); - Actions::checkCustomVariablesPluginEnabled(); - $customVariables = APICustomVariables::getInstance()->getCustomVariables($idSite, $period, $date, $segment, $expanded = false, $_leavePiwikCoreVariables = true); - - $customVarNameToLookFor = ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY; - - $dataTable = new DataTable(); - // Handle case where date=last30&period=day - // FIXMEA: this logic should really be refactored somewhere, this is ugly! - if ($customVariables instanceof DataTable\Map) { - $dataTable = $customVariables->getEmptyClone(); - - $customVariableDatatables = $customVariables->getDataTables(); - foreach ($customVariableDatatables as $key => $customVariableTableForDate) { - // we do not enter the IF, in the case idSite=1,3 AND period=day&date=datefrom,dateto, - if ($customVariableTableForDate instanceof DataTable - && $customVariableTableForDate->getMetadata(Archive\DataTableFactory::TABLE_METADATA_PERIOD_INDEX) - ) { - $row = $customVariableTableForDate->getRowFromLabel($customVarNameToLookFor); - if ($row) { - $dateRewrite = $customVariableTableForDate->getMetadata(Archive\DataTableFactory::TABLE_METADATA_PERIOD_INDEX)->getDateStart()->toString(); - $idSubtable = $row->getIdSubDataTable(); - $categories = APICustomVariables::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $dateRewrite, $idSubtable, $segment); - $dataTable->addTable($categories, $key); - } - } - } - } elseif ($customVariables instanceof DataTable) { - $row = $customVariables->getRowFromLabel($customVarNameToLookFor); - if ($row) { - $idSubtable = $row->getIdSubDataTable(); - $dataTable = APICustomVariables::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment); - } - } + $dataTable = Archive::createDataTableFromArchive('Actions_SiteSearchCategories', $idSite, $period, $date, $segment); + + $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors'); $this->filterActionsDataTable($dataTable, $isPageTitleType = false); $dataTable->filter('ReplaceColumnNames'); $this->addPagesPerSearchColumn($dataTable, $columnToRead = 'nb_actions'); + return $dataTable; } diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 62c0755849..bdaa1e973b 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -142,17 +142,6 @@ class Actions extends \Piwik\Plugin return true; } - public static function checkCustomVariablesPluginEnabled() - { - if (!self::isCustomVariablesPluginsEnabled()) { - throw new \Exception("To Track Site Search Categories, please ask the Piwik Administrator to enable the 'Custom Variables' plugin in Settings > Plugins."); - } - } - - public static function isCustomVariablesPluginsEnabled() - { - return \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables'); - } public function configureViewDataTable(ViewDataTable $view) { diff --git a/plugins/Actions/Actions/ActionSiteSearch.php b/plugins/Actions/Actions/ActionSiteSearch.php index 811f6f8996..e04d06db0c 100644 --- a/plugins/Actions/Actions/ActionSiteSearch.php +++ b/plugins/Actions/Actions/ActionSiteSearch.php @@ -28,11 +28,6 @@ class ActionSiteSearch extends Action private $searchCategory = false; private $searchCount = false; - const CVAR_KEY_SEARCH_CATEGORY = '_pk_scat'; - const CVAR_KEY_SEARCH_COUNT = '_pk_scount'; - const CVAR_INDEX_SEARCH_CATEGORY = '4'; - const CVAR_INDEX_SEARCH_COUNT = '5'; - public function __construct(Request $request, $detect = true) { parent::__construct(Action::TYPE_SITE_SEARCH, $request); @@ -101,26 +96,22 @@ class ActionSiteSearch extends Action return true; } - public function getCustomVariables() + public function getSearchCategory() { - $customVariables = parent::getCustomVariables(); - - // Enrich Site Search actions with Custom Variables, overwriting existing values - if (!empty($this->searchCategory)) { - if (!empty($customVariables['custom_var_k' . self::CVAR_INDEX_SEARCH_CATEGORY])) { - Common::printDebug("WARNING: Overwriting existing Custom Variable in slot " . self::CVAR_INDEX_SEARCH_CATEGORY . " for this page view"); - } - $customVariables['custom_var_k' . self::CVAR_INDEX_SEARCH_CATEGORY] = self::CVAR_KEY_SEARCH_CATEGORY; - $customVariables['custom_var_v' . self::CVAR_INDEX_SEARCH_CATEGORY] = Request::truncateCustomVariable($this->searchCategory); + $searchCategory = trim($this->searchCategory); + if (!empty($searchCategory)) { + // Max length of DB field = 200 + $searchCategory = substr($this->searchCategory, 0, 200); } + return $searchCategory; + } + + public function getSearchCount() + { if ($this->searchCount !== false) { - if (!empty($customVariables['custom_var_k' . self::CVAR_INDEX_SEARCH_COUNT])) { - Common::printDebug("WARNING: Overwriting existing Custom Variable in slot " . self::CVAR_INDEX_SEARCH_COUNT . " for this page view"); - } - $customVariables['custom_var_k' . self::CVAR_INDEX_SEARCH_COUNT] = self::CVAR_KEY_SEARCH_COUNT; - $customVariables['custom_var_v' . self::CVAR_INDEX_SEARCH_COUNT] = (int)$this->searchCount; + $this->searchCount = (int)$this->searchCount; } - return $customVariables; + return $this->searchCount; } public static function detectSiteSearchFromUrl($website, $parsedUrl, $pageEncoding = null) @@ -295,5 +286,4 @@ class ActionSiteSearch extends Action $count ); } - } diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index 35ecf41230..df02b099c2 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -9,11 +9,11 @@ namespace Piwik\Plugins\Actions; use Piwik\Config; +use Piwik\DataArray; use Piwik\DataTable; use Piwik\Metrics as PiwikMetrics; use Piwik\RankingQuery; use Piwik\Tracker\Action; -use Piwik\Plugins\Actions\Actions\ActionSiteSearch; /** * Class encapsulating logic to process Day/Period Archiving for the Actions reports @@ -25,6 +25,7 @@ class Archiver extends \Piwik\Plugin\Archiver const OUTLINKS_RECORD_NAME = 'Actions_outlink'; const PAGE_TITLES_RECORD_NAME = 'Actions_actions'; const SITE_SEARCH_RECORD_NAME = 'Actions_sitesearch'; + const SITE_SEARCH_CATEGORY_RECORD_NAME = 'Actions_SiteSearchCategories'; const PAGE_URLS_RECORD_NAME = 'Actions_actions_url'; const METRIC_PAGEVIEWS_RECORD_NAME = 'Actions_nb_pageviews'; @@ -61,6 +62,7 @@ class Archiver extends \Piwik\Plugin\Archiver $this->archiveDayPageActions($rankingQueryLimit); $this->archiveDaySiteSearchActions($rankingQueryLimit); + $this->archiveDaySearchCategoryActions(); $this->archiveDayEntryActions($rankingQueryLimit); $this->archiveDayExitActions($rankingQueryLimit); $this->archiveDayActionsTime($rankingQueryLimit); @@ -103,8 +105,7 @@ class Archiver extends \Piwik\Plugin\Archiver protected function updateQuerySelectFromForSiteSearch(&$select, &$from) { $selectFlagNoResultKeywords = ", - CASE WHEN (MAX(log_link_visit_action.custom_var_v" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . ") = 0 - AND log_link_visit_action.custom_var_k" . ActionSiteSearch::CVAR_INDEX_SEARCH_COUNT . " = '" . ActionSiteSearch::CVAR_KEY_SEARCH_COUNT . "') + CASE WHEN (MAX(log_link_visit_action.search_count) = 0) THEN 1 ELSE 0 END AS `" . PiwikMetrics::INDEX_SITE_SEARCH_HAS_NO_RESULT . "`"; @@ -165,6 +166,25 @@ class Archiver extends \Piwik\Plugin\Archiver } } + protected function archiveDaySearchCategoryActions() + { + $where = "%s.search_cat != '' AND %s.search_cat IS NOT NULL"; + $dimensions = array('search_cat'); + $query = $this->getLogAggregator()->queryActionsByDimension( + $dimensions, + $where + ); + + $dataArray = new DataArray(); + while ($row = $query->fetch()) { + $dataArray->sumMetricsActions($row['search_cat'], $row); + } + + $dataTable = $dataArray->asDataTable(); + $report = $dataTable->getSerialized(); + $this->getProcessor()->insertBlobRecord(self::SITE_SEARCH_CATEGORY_RECORD_NAME, $report); + } + protected function archiveDayActions($rankingQueryLimit, array $actionTypes, $includePageNotDefined) { $metricsConfig = Metrics::getActionMetrics(); @@ -529,6 +549,7 @@ class Archiver extends \Piwik\Plugin\Archiver self::DOWNLOADS_RECORD_NAME, self::OUTLINKS_RECORD_NAME, self::SITE_SEARCH_RECORD_NAME, + self::SITE_SEARCH_CATEGORY_RECORD_NAME, ); $aggregation = null; $nameToCount = $this->getProcessor()->aggregateDataTableRecords($dataTableToSum, diff --git a/plugins/Actions/Columns/SearchCategory.php b/plugins/Actions/Columns/SearchCategory.php index 09b6a836b0..d5a2f433a6 100644 --- a/plugins/Actions/Columns/SearchCategory.php +++ b/plugins/Actions/Columns/SearchCategory.php @@ -8,11 +8,35 @@ */ namespace Piwik\Plugins\Actions\Columns; -use Piwik\Columns\Dimension; -use Piwik\Piwik; +use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugin\Segment; +use Piwik\Plugins\Actions\Actions\ActionSiteSearch; +use Piwik\Tracker\Action; +use Piwik\Tracker\Request; +use Piwik\Tracker\Visitor; -class SearchCategory extends Dimension +class SearchCategory extends ActionDimension { protected $type = self::TYPE_TEXT; protected $nameSingular = 'Actions_ColumnSearchCategory'; + protected $namePlural = 'Actions_SiteSearchCategories'; + protected $segmentName = 'siteSearchCategory'; + protected $columnName = 'search_cat'; + protected $columnType = 'VARCHAR(200) NULL'; + + public function onNewAction(Request $request, Visitor $visitor, Action $action) + { + if ($action instanceof ActionSiteSearch) { + return $action->getSearchCategory(); + } + + return parent::onNewAction($request, $visitor, $action); + } + + protected function addSegment(Segment $segment) + { + $segment->setName('Actions_SiteSearchCategory'); // use another name for segment + + parent::addSegment($segment); + } }
\ No newline at end of file diff --git a/plugins/Actions/Columns/SearchCount.php b/plugins/Actions/Columns/SearchCount.php new file mode 100644 index 0000000000..bf1f155c14 --- /dev/null +++ b/plugins/Actions/Columns/SearchCount.php @@ -0,0 +1,34 @@ +<?php +/** + * Matomo - free/libre analytics platform + * + * @link https://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Actions\Columns; + +use Piwik\Plugin\Dimension\ActionDimension; +use Piwik\Plugins\Actions\Actions\ActionSiteSearch; +use Piwik\Tracker\Action; +use Piwik\Tracker\Request; +use Piwik\Tracker\Visitor; + +class SearchCount extends ActionDimension +{ + protected $type = self::TYPE_TEXT; + protected $nameSingular = 'Actions_SiteSearchKeywordCount'; + protected $namePlural = 'Actions_SiteSearchKeywordCounts'; + protected $columnName = 'search_count'; + protected $segmentName = 'siteSearchCount'; + protected $columnType = 'INTEGER(10) UNSIGNED NULL'; + + public function onNewAction(Request $request, Visitor $visitor, Action $action) + { + if ($action instanceof ActionSiteSearch) { + return $action->getSearchCount(); + } + + return parent::onNewAction($request, $visitor, $action); + } +}
\ No newline at end of file diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php index 7115f725d0..be323b92ad 100644 --- a/plugins/Actions/Reports/GetSiteSearchCategories.php +++ b/plugins/Actions/Reports/GetSiteSearchCategories.php @@ -10,7 +10,6 @@ namespace Piwik\Plugins\Actions\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\Actions\Actions; use Piwik\Plugins\Actions\Columns\SearchCategory; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; @@ -30,7 +29,7 @@ class GetSiteSearchCategories extends SiteSearchBase protected function isEnabledForIdSites($idSites, $idSite) { - return parent::isEnabledForIdSites($idSites, $idSite) && Actions::isCustomVariablesPluginsEnabled(); + return parent::isEnabledForIdSites($idSites, $idSite); } public function getMetrics() diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php index 61ceff342e..940735b938 100644 --- a/plugins/Actions/VisitorDetails.php +++ b/plugins/Actions/VisitorDetails.php @@ -117,9 +117,14 @@ class VisitorDetails extends VisitorDetailsAbstract if ($action['type'] == Action::TYPE_SITE_SEARCH) { // Handle Site Search $action['siteSearchKeyword'] = $action['pageTitle']; + $action['siteSearchCategory'] = $action['search_cat']; + $action['siteSearchCount'] = $action['search_count']; unset($action['pageTitle']); } + unset($action['search_cat']); + unset($action['search_count']); + // Generation time if ($this->shouldHandleAction($action) && empty($action['eventType']) && isset($action['custom_float']) && $action['custom_float'] > 0) { $action['generationTimeMilliseconds'] = $action['custom_float']; @@ -207,6 +212,15 @@ class VisitorDetails extends VisitorDetailsAbstract $action['iconSVG'] = 'plugins/Morpheus/images/search.svg'; $action['title'] = Piwik::translate('Actions_SubmenuSitesearch'); $action['subtitle'] = $action['siteSearchKeyword']; + + if (!empty($action['siteSearchCategory'])) { + $action['subtitle'] .= ' - ' . Piwik::translate('Actions_ColumnSearchCategory') . ': ' . $action['siteSearchCategory']; + } + + if (!empty($action['siteSearchCount'])) { + $action['subtitle'] .= ' - ' . Piwik::translate('Actions_ColumnSearchResultsCount') . ': ' . $action['siteSearchCount']; + } + break; case Action::TYPE_PAGE_URL: case Action::TYPE_PAGE_TITLE: @@ -262,7 +276,9 @@ class VisitorDetails extends VisitorDetailsAbstract log_link_visit_action.time_spent_ref_action as timeSpentRef, log_link_visit_action.idlink_va AS pageId, log_link_visit_action.custom_float, - log_link_visit_action.interaction_position + log_link_visit_action.interaction_position, + log_link_visit_action.search_cat, + log_link_visit_action.search_count " . $customActionDimensionFields . " FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json index 218e51486d..5baab108f8 100644 --- a/plugins/Actions/lang/en.json +++ b/plugins/Actions/lang/en.json @@ -57,6 +57,8 @@ "SiteSearchCategories": "Categories (Site Search)", "SiteSearchKeyword": "Keyword (Site Search)", "SiteSearchKeywords": "Keywords (Site Search)", + "SiteSearchKeywordCount": "Keyword count (Site Search)", + "SiteSearchKeywordCounts": "Keyword counts (Site Search)", "SiteSearchKeywordsDocumentation": "This report lists the Search Keywords that visitors searched for on your internal Search Engine.", "SiteSearchKeywordsNoResultDocumentation": "This report lists the Search Keywords that did not return any Search result: maybe the search engine algorithm can be improved, or maybe your visitors are looking for content that is not (yet) on your website?", "SubmenuPagesEntry": "Entry pages", diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index d3075e8eb9..863003169e 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3792729972fbe30a8d88260aa1b80cb2f7b2d19c1785cf8ab5b0fe3cda6529df -size 311875 +oid sha256:88049ef31d5a0f0f719bbc20a4a2567b26ad3374e7b8aa5e8e5db4cb6c286ff5 +size 316346 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png index 76daea4843..4858b47542 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0a121f9b3b8f2114961c8885895a3014f81e30018910439211c8b3f01140c6b -size 313615 +oid sha256:95b82476fd7b987eaaa4c87cd8b727720fc1d4a981fb5be5bd83d25a4ce4352f +size 317870 diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 4e91daacb5..1625c18836 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -92,7 +92,8 @@ class API extends \Piwik\Plugin\API */ public static function getReservedCustomVariableKeys() { - return array('_pks', '_pkn', '_pkc', '_pkp', ActionSiteSearch::CVAR_KEY_SEARCH_COUNT, ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY); + // Note: _pk_scat and _pk_scount has been used for site search, but aren't in use anymore + return array('_pks', '_pkn', '_pkc', '_pkp', '_pk_scat', '_pk_scount'); } /** diff --git a/plugins/CustomVariables/Columns/SearchCategory.php b/plugins/CustomVariables/Columns/SearchCategory.php deleted file mode 100644 index deefc6b9c6..0000000000 --- a/plugins/CustomVariables/Columns/SearchCategory.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\CustomVariables\Columns; - -use Piwik\Columns\Discriminator; -use Piwik\Plugin\Dimension\ActionDimension; -use Piwik\Plugins\Actions\Actions\ActionSiteSearch; - -class SearchCategory extends ActionDimension -{ - protected $type = self::TYPE_TEXT; - protected $columnName = 'custom_var_v4'; - protected $nameSingular = 'Actions_SiteSearchCategory'; - protected $namePlural = 'Actions_SiteSearchCategories'; - - public function getDbDiscriminator() - { - return new Discriminator($this->dbTableName, 'custom_var_k4', ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY); - } -}
\ No newline at end of file diff --git a/plugins/CustomVariables/VisitorDetails.php b/plugins/CustomVariables/VisitorDetails.php index 6be82c6e43..d413ce9804 100644 --- a/plugins/CustomVariables/VisitorDetails.php +++ b/plugins/CustomVariables/VisitorDetails.php @@ -41,7 +41,11 @@ class VisitorDetails extends VisitorDetailsAbstract for ($i = 1; $i <= $maxCustomVariables; $i++) { if (!empty($action['custom_var_k' . $i])) { $cvarKey = $action['custom_var_k' . $i]; - $cvarKey = static::getCustomVariablePrettyKey($cvarKey); + + if (in_array($cvarKey, ['_pk_scat', '_pk_scount'])) { + continue; // ignore old site search variables + } + $customVariablesPage[$i] = array( 'customVariablePageName' . $i => $cvarKey, 'customVariablePageValue' . $i => $action['custom_var_v' . $i], @@ -77,19 +81,6 @@ class VisitorDetails extends VisitorDetailsAbstract return [[ 50, $view->render() ]]; } - private static function getCustomVariablePrettyKey($key) - { - $rename = array( - ActionSiteSearch::CVAR_KEY_SEARCH_CATEGORY => Piwik::translate('Actions_ColumnSearchCategory'), - ActionSiteSearch::CVAR_KEY_SEARCH_COUNT => Piwik::translate('Actions_ColumnSearchResultsCount'), - ); - if (isset($rename[$key])) { - return $rename[$key]; - } - return $key; - } - - protected $customVariables = []; public function initProfile($visits, &$profile) diff --git a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php index 168deb6e33..59d3139cd8 100644 --- a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php +++ b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php @@ -41,12 +41,12 @@ Statistics for the archive_numeric_2010_03 and archive_blob_2010_03 tables: +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ | Group | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows | # Blob Data | +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ -| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | -| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | +| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 97 | %d | +| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 97 | %d | | day[2010-03-03 - 2010-03-03] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-04 - 2010-03-04] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-05 - 2010-03-05] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | -| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 72 | %d | +| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 73 | %d | | day[2010-03-07 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-08 - 2010-03-08] idSite = 1 | 5 | 0 | 0 | 0 | 4 | 0 | 0 | | | week[2010-03-08 - 2010-03-14] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | diff --git a/plugins/Live/templates/_actionTooltip.twig b/plugins/Live/templates/_actionTooltip.twig index b0e885a1ae..5b20add67e 100644 --- a/plugins/Live/templates/_actionTooltip.twig +++ b/plugins/Live/templates/_actionTooltip.twig @@ -5,4 +5,10 @@ {{ 'General_ColumnGenerationTime'|translate }}: {{ action.generationTime|raw }}{% endif %} {%- if action.timeSpentPretty is defined %} -{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif -%}
\ No newline at end of file +{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif %} +{%- if action.siteSearchCategory|default(false) %} + +{{ 'Actions_ColumnSearchCategory'|translate }}: {{ action.siteSearchCategory|rawSafeDecoded }}{% endif %} +{%- if action.siteSearchCount|default(false) %} + +{{ 'Actions_ColumnSearchResultsCount'|translate }}: {{ action.siteSearchCount|rawSafeDecoded }}{% endif %}
\ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json index 46afcfc20c..71f53d2307 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json @@ -5233,16 +5233,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "4", "idsite": "1", "idvisit": "1", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -5965,16 +5963,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "61", "idsite": "1", "idvisit": "15", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-02 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -6474,14 +6470,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "101", "idsite": "1", "idvisit": "27", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-02 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -6703,16 +6699,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "120", "idsite": "1", "idvisit": "33", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -7435,16 +7429,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "177", "idsite": "1", "idvisit": "47", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -7944,14 +7936,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "217", "idsite": "1", "idvisit": "59", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -8173,16 +8165,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "236", "idsite": "2", "idvisit": "65", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -8905,16 +8895,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "293", "idsite": "2", "idvisit": "79", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -9414,14 +9402,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "333", "idsite": "2", "idvisit": "91", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json index 62f0e70a97..9bab6f815b 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json @@ -1734,10 +1734,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -1747,6 +1743,8 @@ "idvisit": "1", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -2631,10 +2629,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -2644,6 +2638,8 @@ "idvisit": "15", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-02 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -3257,8 +3253,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -3268,6 +3262,8 @@ "idvisit": "27", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-02 03:04:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json index 85e54dffe5..4d09f5d106 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json @@ -5123,16 +5123,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "4", "idsite": "1", "idvisit": "1", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -5903,16 +5901,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "61", "idsite": "1", "idvisit": "15", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-02 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -6441,14 +6437,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "101", "idsite": "1", "idvisit": "27", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-02 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -6697,10 +6693,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -6710,6 +6702,8 @@ "idvisit": "33", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -7594,10 +7588,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -7607,6 +7597,8 @@ "idvisit": "47", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -8220,8 +8212,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -8231,6 +8221,8 @@ "idvisit": "59", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -8510,10 +8502,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -8523,6 +8511,8 @@ "idvisit": "65", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -9407,10 +9397,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -9420,6 +9406,8 @@ "idvisit": "79", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -10033,8 +10021,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -10044,6 +10030,8 @@ "idvisit": "91", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json index f18e05aeca..efbc74c61c 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json @@ -5187,16 +5187,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "4", "idsite": "1", "idvisit": "1", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -5919,16 +5917,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "61", "idsite": "1", "idvisit": "15", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-02 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -6428,14 +6424,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "101", "idsite": "1", "idvisit": "27", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-02 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -6657,16 +6653,14 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name_ref": "5", "idaction_url_ref": "6", "idlink_va": "120", "idsite": "1", "idvisit": "33", "idvisitor": "08aa728aec13d68d", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -7389,16 +7383,14 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name_ref": "3", "idaction_url_ref": "47", "idlink_va": "177", "idsite": "1", "idvisit": "47", "idvisitor": "0e64dad0a7ea5650", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -7898,14 +7890,14 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name_ref": "1", "idaction_url_ref": "65", "idlink_va": "217", "idsite": "1", "idvisit": "59", "idvisitor": "d57f2b2bcf932329", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -8136,10 +8128,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -8149,6 +8137,8 @@ "idvisit": "65", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -9033,10 +9023,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -9046,6 +9032,8 @@ "idvisit": "79", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -9659,8 +9647,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -9670,6 +9656,8 @@ "idvisit": "91", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json index 601510ecb3..8828d32ed2 100755 --- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json +++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json @@ -11844,10 +11844,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -11857,6 +11853,8 @@ "idvisit": "1", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -12741,10 +12739,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -12754,6 +12748,8 @@ "idvisit": "15", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-02 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -13367,8 +13363,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -13378,6 +13372,8 @@ "idvisit": "27", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-02 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -13657,10 +13653,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -13670,6 +13662,8 @@ "idvisit": "33", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -14554,10 +14548,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -14567,6 +14557,8 @@ "idvisit": "47", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -15180,8 +15172,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -15191,6 +15181,8 @@ "idvisit": "59", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -15470,10 +15462,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -15483,6 +15471,8 @@ "idvisit": "65", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-08 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -16367,10 +16357,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -16380,6 +16366,8 @@ "idvisit": "79", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-08 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -16993,8 +16981,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -17004,6 +16990,8 @@ "idvisit": "91", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-08 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -17283,10 +17271,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -17296,6 +17280,8 @@ "idvisit": "97", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-11 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -18180,10 +18166,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -18193,6 +18175,8 @@ "idvisit": "111", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-11 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -18806,8 +18790,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -18817,6 +18799,8 @@ "idvisit": "123", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-11 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -19096,10 +19080,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -19109,6 +19089,8 @@ "idvisit": "129", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-11 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -19993,10 +19975,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -20006,6 +19984,8 @@ "idvisit": "143", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-11 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -20619,8 +20599,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -20630,6 +20608,8 @@ "idvisit": "155", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-11 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -20909,10 +20889,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -20922,6 +20898,8 @@ "idvisit": "161", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-11 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -21806,10 +21784,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -21819,6 +21793,8 @@ "idvisit": "175", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-11 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -22432,8 +22408,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -22443,6 +22417,8 @@ "idvisit": "187", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-11 03:04:05", "time_spent_ref_action": "00:00:00" }, @@ -22722,10 +22698,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -22735,6 +22707,8 @@ "idvisit": "193", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-05 03:10:05", "time_spent_ref_action": "00:00:00" }, @@ -23619,10 +23593,6 @@ }, { "custom_float": "9 min 45s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "web", - "custom_var_v5": "205", "idaction_name": "48", "idaction_name_ref": "3", "idaction_url_ref": "47", @@ -23632,6 +23602,8 @@ "idvisit": "207", "idvisitor": "0e64dad0a7ea5650", "interaction_position": "3", + "search_cat": "web", + "search_count": "205", "server_time": "2017-01-05 00:10:05", "time_spent_ref_action": "00:00:00" }, @@ -24245,8 +24217,6 @@ }, { "custom_float": "17 min 10s", - "custom_var_k5": "_pk_scount", - "custom_var_v5": "210", "idaction_name": "66", "idaction_name_ref": "1", "idaction_url_ref": "65", @@ -24256,6 +24226,8 @@ "idvisit": "219", "idvisitor": "d57f2b2bcf932329", "interaction_position": "2", + "search_cat": "", + "search_count": "210", "server_time": "2017-01-05 03:04:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json index dafc4ae2c2..04f156202e 100755 --- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json +++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json @@ -101,10 +101,6 @@ }, { "custom_float": "9 min 5s", - "custom_var_k4": "_pk_scat", - "custom_var_k5": "_pk_scount", - "custom_var_v4": "images", - "custom_var_v5": "200", "idaction_name": "7", "idaction_name_ref": "5", "idaction_url_ref": "6", @@ -114,6 +110,8 @@ "idvisit": "1", "idvisitor": "08aa728aec13d68d", "interaction_position": "4", + "search_cat": "images", + "search_count": "200", "server_time": "2017-01-02 03:10:05", "time_spent_ref_action": "00:00:00" }, diff --git a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index e552d62330..da3d21a6ab 100644 --- a/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/plugins/PrivacyManager/tests/System/expected/test___PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -117,6 +117,14 @@ <default_value /> </row> <row> + <column_name>search_cat</column_name> + <default_value /> + </row> + <row> + <column_name>search_count</column_name> + <default_value /> + </row> + <row> <column_name>time_spent</column_name> <default_value /> </row> diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml index 87dff606d2..82d5c09856 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml @@ -94,24 +94,16 @@ <pageId>352</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -1640,24 +1632,16 @@ <pageId>468</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -3186,24 +3170,16 @@ <pageId>584</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -5367,20 +5343,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -6319,20 +6291,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -7271,20 +7239,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -10408,24 +10372,16 @@ <pageId>409</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -10951,24 +10907,16 @@ <pageId>525</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -11494,24 +11442,16 @@ <pageId>641</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -18429,24 +18369,16 @@ <pageId>236</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -20610,20 +20542,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -21933,24 +21861,16 @@ <pageId>293</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -24502,24 +24422,16 @@ <pageId>120</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -26048,24 +25960,16 @@ <pageId>700</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -28229,20 +28133,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -29181,20 +29081,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -31382,24 +31278,16 @@ <pageId>177</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -31896,24 +31784,16 @@ <pageId>757</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> @@ -36648,24 +36528,16 @@ <pageId>4</pageId> <bandwidth /> <siteSearchKeyword>mobile</siteSearchKeyword> + <siteSearchCategory>images</siteSearchCategory> + <siteSearchCount>200</siteSearchCount> <generationTimeMilliseconds>545</generationTimeMilliseconds> <generationTime>0.55s</generationTime> <interactionPosition>4</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>mobile</subtitle> + <subtitle>mobile - Search Category: images - Search Results Count: 200</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>images</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>200</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -38829,20 +38701,16 @@ <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> <siteSearchKeyword>analytics</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount>210</siteSearchCount> <generationTimeMilliseconds>1030</generationTimeMilliseconds> <generationTime>1.03s</generationTime> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>analytics</subtitle> + <subtitle>analytics - Search Results Count: 210</subtitle> - <customVariables> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>210</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -40210,24 +40078,16 @@ <pageId>61</pageId> <bandwidth /> <siteSearchKeyword>ecommerce</siteSearchKeyword> + <siteSearchCategory>web</siteSearchCategory> + <siteSearchCount>205</siteSearchCount> <generationTimeMilliseconds>585</generationTimeMilliseconds> <generationTime>0.59s</generationTime> <interactionPosition>3</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>ecommerce</subtitle> + <subtitle>ecommerce - Search Category: web - Search Results Count: 205</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>web</customVariablePageValue4> - </row> - <row> - <customVariablePageName5>Search Results Count</customVariablePageName5> - <customVariablePageValue5>205</customVariablePageValue5> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index 571795140b..38b812e400 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -199,7 +199,7 @@ class ManyVisitsWithGeoIP extends Fixture $date = $date->addHour(0.1); $t->setForceVisitDateTime($date->getDatetime()); if( ($visitorCounter % 2) == 0) { - $r = $t->doTrackSiteSearch('Bring on the party', 'CAT'); + $r = $t->doTrackSiteSearch('Bring on the party', 'CAT', $visitorCounter*6); } if (!$doBulk) { diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php index 2a005ab980..04fdbe8b61 100644 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php @@ -101,9 +101,9 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa */ public function test_checkArchiveRecords_whenPeriodIsRange() { - // we expect 5 blobs for Actions plugins, because flat=1 or expanded=1 was not set + // we expect 6 blobs for Actions plugins, because flat=1 or expanded=1 was not set // so we only archived the parent table - $expectedActionsBlobs = 5; + $expectedActionsBlobs = 6; // When flat=1, Actions plugin will process 5 + 1 extra chunk blobs (URL = 'http://example.org/sub1/sub2/sub3/news') $expectedActionsBlobsWhenFlattened = $expectedActionsBlobs + 1; diff --git a/tests/PHPUnit/System/SiteSearchTest.php b/tests/PHPUnit/System/SiteSearchTest.php index ee9c8bce46..516368efe0 100644 --- a/tests/PHPUnit/System/SiteSearchTest.php +++ b/tests/PHPUnit/System/SiteSearchTest.php @@ -34,7 +34,6 @@ class SiteSearchTest extends SystemTestCase 'Actions.get', 'Actions.getPageUrls', 'Actions.getPageTitles', - 'CustomVariables.getCustomVariables', 'Actions.getSiteSearchKeywords', 'Actions.getSiteSearchCategories', 'Actions.getSiteSearchNoResultKeywords', diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index e552d62330..da3d21a6ab 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -117,6 +117,14 @@ <default_value /> </row> <row> + <column_name>search_cat</column_name> + <default_value /> + </row> + <row> + <column_name>search_count</column_name> + <default_value /> + </row> + <row> <column_name>time_spent</column_name> <default_value /> </row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 5315e19174..bd605241db 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -52,18 +52,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>48</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 48</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 975ef79ea7..3d746bcaf0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -207,18 +207,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>36</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 36</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 57845674d8..80a26df20a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -189,18 +189,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>48</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 48</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -964,18 +960,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>36</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 36</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 57845674d8..80a26df20a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -189,18 +189,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>48</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 48</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -964,18 +960,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>36</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 36</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index b073c95721..40c34f4bbf 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -189,18 +189,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>48</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 48</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -964,18 +960,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>36</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 36</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> @@ -1739,18 +1731,14 @@ <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> <siteSearchKeyword>Bring on the party</siteSearchKeyword> + <siteSearchCategory>CAT</siteSearchCategory> + <siteSearchCount>24</siteSearchCount> <interactionPosition>2</interactionPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> - <subtitle>Bring on the party</subtitle> + <subtitle>Bring on the party - Search Category: CAT - Search Results Count: 24</subtitle> - <customVariables> - <row> - <customVariablePageName4>Search Category</customVariablePageName4> - <customVariablePageValue4>CAT</customVariablePageValue4> - </row> - </customVariables> <bandwidth_pretty>0 M</bandwidth_pretty> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml index f10505afcc..17fcb0d88a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml @@ -4,6 +4,6 @@ <row>_pkn</row> <row>_pkc</row> <row>_pkp</row> - <row>_pk_scount</row> <row>_pk_scat</row> + <row>_pk_scount</row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index e552d62330..da3d21a6ab 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -117,6 +117,14 @@ <default_value /> </row> <row> + <column_name>search_cat</column_name> + <default_value /> + </row> + <row> + <column_name>search_count</column_name> + <default_value /> + </row> + <row> <column_name>time_spent</column_name> <default_value /> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 5329fe47a5..9c3978b3c5 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -290,6 +290,8 @@ <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> <siteSearchKeyword>Banks Own The World</siteSearchKeyword> + <siteSearchCategory /> + <siteSearchCount /> <generationTimeMilliseconds>812</generationTimeMilliseconds> <generationTime>0.81s</generationTime> <interactionPosition>3</interactionPosition> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml index fb7aa48a2b..5afa37a28b 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml @@ -54,10 +54,20 @@ <exit_rate>0%</exit_rate> </row> </result> + <result prettyDate="Tuesday, January 5, 2010" /> + <result prettyDate="Wednesday, January 6, 2010" /> + <result prettyDate="Thursday, January 7, 2010" /> + <result prettyDate="Friday, January 8, 2010" /> + <result prettyDate="Saturday, January 9, 2010" /> </reportData> <reportMetadata> <result prettyDate="Sunday, January 3, 2010" /> <result prettyDate="Monday, January 4, 2010" /> + <result prettyDate="Tuesday, January 5, 2010" /> + <result prettyDate="Wednesday, January 6, 2010" /> + <result prettyDate="Thursday, January 7, 2010" /> + <result prettyDate="Friday, January 8, 2010" /> + <result prettyDate="Saturday, January 9, 2010" /> </reportMetadata> <reportTotal> <nb_uniq_visitors>4</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml index 8086186a1f..d72ba864f0 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml @@ -52,9 +52,21 @@ <exit_rate>0%</exit_rate> </row> </result> + <result prettyDate="February 2010" /> + <result prettyDate="March 2010" /> + <result prettyDate="April 2010" /> + <result prettyDate="May 2010" /> + <result prettyDate="June 2010" /> + <result prettyDate="July 2010" /> </reportData> <reportMetadata> <result prettyDate="January 2010" /> + <result prettyDate="February 2010" /> + <result prettyDate="March 2010" /> + <result prettyDate="April 2010" /> + <result prettyDate="May 2010" /> + <result prettyDate="June 2010" /> + <result prettyDate="July 2010" /> </reportMetadata> <reportTotal> <nb_visits>4</nb_visits> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml index a91076f826..e3f6a3cea2 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml @@ -1,3 +1,57 @@ <?xml version="1.0" encoding="utf-8" ?> <results> + <result idSite="1"> + <result date="2010-01-03"> + <row> + <label>Search Category</label> + <nb_visits>2</nb_visits> + <nb_actions>3</nb_actions> + <nb_pages_per_search>1.5</nb_pages_per_search> + </row> + </result> + <result date="2010-01-04"> + <row> + <label>Bad No Result Category :(</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + <row> + <label>Category</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + </result> + <result date="2010-01-05" /> + <result date="2010-01-06" /> + <result date="2010-01-07" /> + <result date="2010-01-08" /> + <result date="2010-01-09" /> + </result> + <result idSite="2"> + <result date="2010-01-03"> + <row> + <label>Bad No Result Category bis :(</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + </result> + <result date="2010-01-04" /> + <result date="2010-01-05" /> + <result date="2010-01-06" /> + <result date="2010-01-07" /> + <result date="2010-01-08" /> + <result date="2010-01-09" /> + </result> + <result idSite="3"> + <result date="2010-01-03" /> + <result date="2010-01-04" /> + <result date="2010-01-05" /> + <result date="2010-01-06" /> + <result date="2010-01-07" /> + <result date="2010-01-08" /> + <result date="2010-01-09" /> + </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml index a91076f826..37b984abe8 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml @@ -1,3 +1,60 @@ <?xml version="1.0" encoding="utf-8" ?> <results> + <result idSite="1"> + <result date="2010-01"> + <row> + <label>Search Category</label> + <nb_visits>2</nb_visits> + <nb_actions>3</nb_actions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <nb_pages_per_search>1.5</nb_pages_per_search> + </row> + <row> + <label>Bad No Result Category :(</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + <row> + <label>Category</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + </result> + <result date="2010-02" /> + <result date="2010-03" /> + <result date="2010-04" /> + <result date="2010-05" /> + <result date="2010-06" /> + <result date="2010-07" /> + </result> + <result idSite="2"> + <result date="2010-01"> + <row> + <label>Bad No Result Category bis :(</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_pages_per_search>1</nb_pages_per_search> + </row> + </result> + <result date="2010-02" /> + <result date="2010-03" /> + <result date="2010-04" /> + <result date="2010-05" /> + <result date="2010-06" /> + <result date="2010-07" /> + </result> + <result idSite="3"> + <result date="2010-01" /> + <result date="2010-02" /> + <result date="2010-03" /> + <result date="2010-04" /> + <result date="2010-05" /> + <result date="2010-06" /> + <result date="2010-07" /> + </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml deleted file mode 100644 index 5b6b0bc255..0000000000 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml +++ /dev/null @@ -1,197 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01-03"> - <row> - <label>_pk_scount</label> - <nb_visits>4</nb_visits> - <nb_actions>6</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==_pk_scount</segment> - <subtable> - <row> - <label>0</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - </row> - <row> - <label>10</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - </row> - </subtable> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==_pk_scat</segment> - <subtable> - <row> - <label>Search Category</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04"> - <row> - <label>_pk_scount</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==_pk_scount</segment> - <subtable> - <row> - <label>0</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - <row> - <label>5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - <row> - <label>10</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==_pk_scat</segment> - <subtable> - <row> - <label>Bad No Result Category :(</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - <row> - <label>Category</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> - <result idSite="2"> - <result date="2010-01-03"> - <row> - <label>_pk_scount</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==_pk_scount</segment> - <subtable> - <row> - <label>0</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - </row> - </subtable> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==_pk_scat</segment> - <subtable> - <row> - <label>Bad No Result Category bis :(</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> - <result idSite="3"> - <result date="2010-01-03"> - <row> - <label>test cvar name</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>541</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==test+cvar+name</segment> - <subtable> - <row> - <label>test cvar value</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>541</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> - <result date="2010-01-04" /> - <result date="2010-01-05" /> - <result date="2010-01-06" /> - <result date="2010-01-07" /> - <result date="2010-01-08" /> - <result date="2010-01-09" /> - </result> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml deleted file mode 100644 index 76eae7c657..0000000000 --- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result idSite="1"> - <result date="2010-01"> - <row> - <label>_pk_scount</label> - <nb_visits>7</nb_visits> - <nb_actions>9</nb_actions> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==_pk_scount</segment> - <subtable> - <row> - <label>0</label> - <nb_visits>3</nb_visits> - <nb_actions>4</nb_actions> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>10</label> - <nb_visits>3</nb_visits> - <nb_actions>4</nb_actions> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>5</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>_pk_scat</label> - <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==_pk_scat</segment> - <subtable> - <row> - <label>Search Category</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>Bad No Result Category :(</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - <row> - <label>Category</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> - <result date="2010-02" /> - <result date="2010-03" /> - <result date="2010-04" /> - <result date="2010-05" /> - <result date="2010-06" /> - <result date="2010-07" /> - </result> - <result idSite="2"> - <result date="2010-01"> - <row> - <label>_pk_scount</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - <segment>customVariableName==_pk_scount</segment> - <subtable> - <row> - <label>0</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - </subtable> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - <segment>customVariableName==_pk_scat</segment> - <subtable> - <row> - <label>Bad No Result Category bis :(</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> - <result date="2010-02" /> - <result date="2010-03" /> - <result date="2010-04" /> - <result date="2010-05" /> - <result date="2010-06" /> - <result date="2010-07" /> - </result> - <result idSite="3"> - <result date="2010-01"> - <row> - <label>test cvar name</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>541</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <slots> - <row> - <scope>visit</scope> - <index>1</index> - </row> - </slots> - <segment>customVariableName==test+cvar+name</segment> - <subtable> - <row> - <label>test cvar value</label> - <nb_visits>1</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>541</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</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> - </result> - <result date="2010-02" /> - <result date="2010-03" /> - <result date="2010-04" /> - <result date="2010-05" /> - <result date="2010-06" /> - <result date="2010-07" /> - </result> -</results>
\ 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 deleted file mode 100644 index d02e6fa4ee..0000000000 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <website>Site 1 - Site search</website> - <prettyDate>January 3 – 9, 2010</prettyDate> - <metadata> - <category>Visitors</category> - <subcategory>Custom Variables</subcategory> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariables</action> - <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> - <onlineGuideUrl>https://matomo.org/docs/custom-variables/</onlineGuideUrl> - <dimensions> - <CustomVariables_CustomVariableName>Custom Variable name</CustomVariables_CustomVariableName> - <CustomVariables_CustomVariableValue>Custom Variable value</CustomVariables_CustomVariableValue> - </dimensions> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their 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 they visit 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> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - </processedMetrics> - <actionToLoadSubTables>getCustomVariablesValuesFromNameId</actionToLoadSubTables> - <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=CustomVariables&apiAction=getCustomVariables&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariables&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl> - <uniqueId>CustomVariables_getCustomVariables</uniqueId> - </metadata> - <columns> - <label>Custom Variable name</label> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - <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> - <result prettyDate="Sunday, January 3, 2010"> - <row> - <label>_pk_scount</label> - <nb_visits>4</nb_visits> - <nb_actions>6</nb_actions> - <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> - <revenue>$0</revenue> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>2</nb_visits> - <nb_actions>3</nb_actions> - <nb_actions_per_visit>1.5</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> - <revenue>$0</revenue> - </row> - </result> - <result prettyDate="Monday, January 4, 2010"> - <row> - <label>_pk_scount</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> - <revenue>$0</revenue> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> - <revenue>$0</revenue> - </row> - </result> - <result prettyDate="Tuesday, January 5, 2010" /> - <result prettyDate="Wednesday, January 6, 2010" /> - <result prettyDate="Thursday, January 7, 2010" /> - <result prettyDate="Friday, January 8, 2010" /> - <result prettyDate="Saturday, January 9, 2010" /> - </reportData> - <reportMetadata> - <result prettyDate="Sunday, January 3, 2010"> - <row> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - - <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>3</idsubdatatable> - </row> - <row> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - - <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>2</idsubdatatable> - </row> - </result> - <result prettyDate="Monday, January 4, 2010"> - <row> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - - <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>6</idsubdatatable> - </row> - <row> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - - <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>5</idsubdatatable> - </row> - </result> - <result prettyDate="Tuesday, January 5, 2010" /> - <result prettyDate="Wednesday, January 6, 2010" /> - <result prettyDate="Thursday, January 7, 2010" /> - <result prettyDate="Friday, January 8, 2010" /> - <result prettyDate="Saturday, January 9, 2010" /> - </reportMetadata> - <reportTotal> - <nb_uniq_visitors>11</nb_uniq_visitors> - <nb_visits>11</nb_visits> - <nb_actions>14</nb_actions> - <nb_actions_per_visit>2.5</nb_actions_per_visit> - </reportTotal> -</result>
\ No newline at end of file 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 deleted file mode 100644 index 25d1860f9f..0000000000 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <website>Site 1 - Site search</website> - <prettyDate>January 1 – July 31, 2010</prettyDate> - <metadata> - <category>Visitors</category> - <subcategory>Custom Variables</subcategory> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariables</action> - <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer noopener" target="_blank">Custom Variables documentation on matomo.org</a></documentation> - <onlineGuideUrl>https://matomo.org/docs/custom-variables/</onlineGuideUrl> - <dimensions> - <CustomVariables_CustomVariableName>Custom Variable name</CustomVariables_CustomVariableName> - <CustomVariables_CustomVariableValue>Custom Variable value</CustomVariables_CustomVariableValue> - </dimensions> - <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 they visit a page more than 30 minutes after their 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 they visit 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> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - </processedMetrics> - <actionToLoadSubTables>getCustomVariablesValuesFromNameId</actionToLoadSubTables> - <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=CustomVariables&apiAction=getCustomVariables&period=range&date=2010-01-03,2010-07-03</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=CustomVariables&apiAction=getCustomVariables&period=month&date=2010-01-03,2010-07-03</imageGraphEvolutionUrl> - <uniqueId>CustomVariables_getCustomVariables</uniqueId> - </metadata> - <columns> - <label>Custom Variable name</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> - <result prettyDate="January 2010"> - <row> - <label>_pk_scount</label> - <nb_visits>7</nb_visits> - <nb_actions>9</nb_actions> - <nb_actions_per_visit>1.3</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <revenue>$0</revenue> - </row> - <row> - <label>_pk_scat</label> - <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> - <nb_actions_per_visit>1.3</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <revenue>$0</revenue> - </row> - </result> - <result prettyDate="February 2010" /> - <result prettyDate="March 2010" /> - <result prettyDate="April 2010" /> - <result prettyDate="May 2010" /> - <result prettyDate="June 2010" /> - <result prettyDate="July 2010" /> - </reportData> - <reportMetadata> - <result prettyDate="January 2010"> - <row> - <slots> - <row> - <scope>page</scope> - <index>5</index> - </row> - </slots> - - <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>3</idsubdatatable> - </row> - <row> - <slots> - <row> - <scope>page</scope> - <index>4</index> - </row> - </slots> - - <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>2</idsubdatatable> - </row> - </result> - <result prettyDate="February 2010" /> - <result prettyDate="March 2010" /> - <result prettyDate="April 2010" /> - <result prettyDate="May 2010" /> - <result prettyDate="June 2010" /> - <result prettyDate="July 2010" /> - </reportMetadata> - <reportTotal> - <nb_visits>11</nb_visits> - <nb_actions>14</nb_actions> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> - <nb_actions_per_visit>1.3</nb_actions_per_visit> - </reportTotal> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index d3d5264cab..6641184d2a 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -565,6 +565,12 @@ <row> <type>dimension</type> <category>Actions</category> + <name>Category (Site Search)</name> + <segment>siteSearchCategory</segment> + </row> + <row> + <type>dimension</type> + <category>Actions</category> <name>Clicked Outlink</name> <segment>outlinkUrl</segment> </row> @@ -635,6 +641,12 @@ <row> <type>dimension</type> <category>Actions</category> + <name>Keyword count (Site Search)</name> + <segment>siteSearchCount</segment> + </row> + <row> + <type>dimension</type> + <category>Actions</category> <name>Page Title</name> <segment>pageTitle</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml index a91076f826..106f23f16b 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml @@ -1,3 +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__Actions.getSiteSearchCategories_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml index a91076f826..867400a47a 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml @@ -1,3 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <results> + <result date="2008-12-29,2009-01-04" /> + <result date="2009-01-05,2009-01-11" /> + <result date="2009-01-12,2009-01-18" /> + <result date="2009-01-19,2009-01-25" /> + <result date="2009-01-26,2009-02-01" /> + <result date="2009-02-02,2009-02-08" /> + <result date="2009-02-09,2009-02-15" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index e552d62330..da3d21a6ab 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -117,6 +117,14 @@ <default_value /> </row> <row> + <column_name>search_cat</column_name> + <default_value /> + </row> + <row> + <column_name>search_count</column_name> + <default_value /> + </row> + <row> <column_name>time_spent</column_name> <default_value /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index e552d62330..da3d21a6ab 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -117,6 +117,14 @@ <default_value /> </row> <row> + <column_name>search_cat</column_name> + <default_value /> + </row> + <row> + <column_name>search_count</column_name> + <default_value /> + </row> + <row> <column_name>time_spent</column_name> <default_value /> </row> |
