diff options
40 files changed, 224 insertions, 49 deletions
diff --git a/core/Columns/Dimension.php b/core/Columns/Dimension.php index aaf1d76f32..79fe835b6d 100644 --- a/core/Columns/Dimension.php +++ b/core/Columns/Dimension.php @@ -116,6 +116,13 @@ abstract class Dimension protected $suggestedValuesCallback; /** + * An API method whose label columns will be used to determine the suggested values should browser archiving + * be disabled. The API must have defined a segment metadata on each row for this to work. + * @var string + */ + protected $suggestedValuesApi = ''; + + /** * Here you should explain which values are accepted/useful for your segment, for example: * "1, 2, 3, etc." or "comcast.net, proxad.net, etc.". If the value needs any special encoding you should mention * this as well. For example "Any URL including protocol. The URL must be URL encoded." @@ -620,6 +627,10 @@ abstract class Dimension $segment->setSuggestedValuesCallback($this->suggestedValuesCallback); } + if ($this->suggestedValuesApi) { + $segment->setSuggestedValuesApi($this->suggestedValuesApi); + } + if ($this->sqlFilterValue && !$segment->getSqlFilterValue()) { $segment->setSqlFilterValue($this->sqlFilterValue); } diff --git a/core/Plugin/Segment.php b/core/Plugin/Segment.php index cfaaa4ef1c..5aae987aed 100644 --- a/core/Plugin/Segment.php +++ b/core/Plugin/Segment.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugin; use Exception; +use Piwik\Development; /** * Creates a new segment that can be used for instance within the {@link \Piwik\Columns\Dimension::configureSegment()} @@ -54,6 +55,7 @@ class Segment private $suggestedValuesCallback; private $unionOfSegments; private $isInternalSegment = false; + private $suggestedValuesApi = ''; /** * If true, this segment will only be visible to the user if the user has view access @@ -297,6 +299,32 @@ class Segment } /** + * @return string + * @ignore + */ + public function getSuggestedValuesApi() + { + return $this->suggestedValuesApi; + } + + /** + * Set callback which will be executed when user will call for suggested values for segment. + * + * @param string $suggestedValuesApi + */ + public function setSuggestedValuesApi($suggestedValuesApi) + { + if (!empty($suggestedValuesApi) && is_string($suggestedValuesApi)) { + if (Development::isEnabled() && strpos($suggestedValuesApi, '.get') === false) { + throw new Exception('Invalid suggested values API defined, expecting ".get" to be present.'); + } + } else { + $suggestedValuesApi = ''; + } + $this->suggestedValuesApi = $suggestedValuesApi; + } + + /** * You can restrict the access to this segment by passing a boolean `false`. For instance if you want to make * a certain segment only available to users having super user access you could do the following: * `$segment->setPermission(Piwik::hasUserSuperUserAccess());` @@ -346,6 +374,10 @@ class Segment $segment['suggestedValuesCallback'] = $this->suggestedValuesCallback; } + if (is_string($this->suggestedValuesApi) && !empty($this->suggestedValuesApi)) { + $segment['suggestedValuesApi'] = $this->suggestedValuesApi; + } + return $segment; } diff --git a/plugins/API/API.php b/plugins/API/API.php index f84c95f443..9d55ce7f1e 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\API; use Piwik\API\Proxy; use Piwik\API\Request; +use Piwik\ArchiveProcessor\Rules; use Piwik\Cache; use Piwik\CacheId; use Piwik\Category\CategoryList; @@ -29,6 +30,7 @@ use Piwik\Plugin\SettingsProvider; use Piwik\Plugins\API\DataTable\MergeDataTables; use Piwik\Plugins\CoreAdminHome\CustomLogo; use Piwik\Plugins\CorePluginsAdmin\SettingsMetadata; +use Piwik\Segment; use Piwik\Site; use Piwik\Translation\Translator; use Piwik\Measurable\Type\TypeManager; @@ -580,6 +582,61 @@ class API extends \Piwik\Plugin\API // if segment has suggested values callback then return result from it instead $suggestedValuesCallbackRequiresTable = false; + + if (!empty($segment['suggestedValuesApi']) && is_string($segment['suggestedValuesApi']) && !Rules::isBrowserTriggerEnabled()) { + $now = Date::now()->setTimezone(Site::getTimezoneFor($idSite)); + if (self::$_autoSuggestLookBack != 60) { + // in Auto suggest tests we need to assume now is in 2018... + // we do - 20 to make sure the year is still correct otherwise could end up being 2017-12-31 and the recorded visits are over several days in the tests we make sure to select the last day a visit was recorded + $now = $now->subDay(self::$_autoSuggestLookBack - 20); + } + // we want to avoid launching the archiver should browser archiving be enabled as this can be very slow... we then rather + // use the live api. + $period = 'year'; + $date = $now->toString(); + if ($now->toString('m') == '01') { + if (Rules::isArchivingDisabledFor(array($idSite), new Segment('', array($idSite)), 'range')) { + $date = $now->subYear(1)->toString(); // use previous year data to avoid using range + } else { + $period = 'range'; + $date = $now->subMonth(1)->toString() . ',' . $now->addDay(1)->toString(); + } + } + + $apiParts = explode('.', $segment['suggestedValuesApi']); + $meta = $this->getMetadata($idSite, $apiParts[0], $apiParts[1]); + $flat = !empty($meta[0]['actionToLoadSubTables']) && $meta[0]['actionToLoadSubTables'] == $apiParts[1]; + + $table = Request::processRequest($segment['suggestedValuesApi'], array( + 'idSite' => $idSite, + 'period' => $period, + 'date' => $date, + 'segment' => '', + 'filter_offset' => 0, + 'flat' => (int) $flat, + 'filter_limit' => $maxSuggestionsToReturn + )); + if ($table && $table instanceof DataTable && $table->getRowsCount()) { + $values = []; + foreach ($table->getRowsWithoutSummaryRow() as $row) { + $segment = $row->getMetadata('segment'); + $remove = array( + $segmentName . Segment\SegmentExpression::MATCH_EQUAL, + $segmentName . Segment\SegmentExpression::MATCH_STARTS_WITH + ); + // we don't look at row columns since this could include rows that won't work eg Other summary rows. etc + // and it is generally not reliable. + if (!empty($segment) && preg_match('/^' . implode('|',$remove) . '/', $segment)) { + $values[] = urldecode(urldecode(str_replace($remove, '', $segment))); + } + } + + $values = array_slice($values, 0, $maxSuggestionsToReturn); + $values = array_map(array('Piwik\Common', 'unsanitizeInputValue'), $values); + return $values; + } + } + if (isset($segment['suggestedValuesCallback'])) { $suggestedValuesCallbackRequiresTable = $this->doesSuggestedValuesCallbackNeedData( $segment['suggestedValuesCallback']); diff --git a/plugins/API/SegmentMetadata.php b/plugins/API/SegmentMetadata.php index ec21e39fb1..ca6cf0e470 100644 --- a/plugins/API/SegmentMetadata.php +++ b/plugins/API/SegmentMetadata.php @@ -94,6 +94,10 @@ class SegmentMetadata ) { unset($segment['suggestedValuesCallback']); } + + if (isset($segment['suggestedValuesApi'])) { + unset($segment['suggestedValuesApi']); + } } } diff --git a/plugins/API/tests/System/AutoSuggestAPITest.php b/plugins/API/tests/System/AutoSuggestAPITest.php index 006f780424..24378e1f6d 100644 --- a/plugins/API/tests/System/AutoSuggestAPITest.php +++ b/plugins/API/tests/System/AutoSuggestAPITest.php @@ -10,11 +10,13 @@ namespace Piwik\Plugins\API\tests\System; use Piwik\API\Request; use Piwik\Application\Environment; +use Piwik\ArchiveProcessor\Rules; use Piwik\Cache as PiwikCache; use Piwik\Columns\Dimension; use Piwik\Common; use Piwik\DataTable\Manager; use Piwik\Date; +use Piwik\Option; use Piwik\Plugins\API\API; use Piwik\Plugins\CustomVariables\Columns\CustomVariableName; use Piwik\Plugins\CustomVariables\Columns\CustomVariableValue; @@ -51,6 +53,8 @@ class AutoSuggestAPITest extends SystemTestCase protected static $processed = 0; protected static $skipped = array(); + private static $hasArchivedData = false; + public static function setUpBeforeClass() { parent::setUpBeforeClass(); @@ -103,6 +107,43 @@ class AutoSuggestAPITest extends SystemTestCase } /** + * @dataProvider getApiForTestingBrowserArchivingDisabled + */ + public function testApiBrowserArchivingDisabled($api, $params) + { + if (!self::$hasArchivedData) { + self::$hasArchivedData = true; + // need to make sure data is archived before disabling the archiving + Request::processRequest('API.get', array( + 'date' => '2018-01-10', 'period' => 'year', 'idSite' => $params['idSite'], + 'trigger' => 'archivephp' + )); + } + + // Refresh cache for CustomVariables\Model + Cache::clearCacheGeneral(); + // disable browser archiving so the APIs are used + Option::set(Rules::OPTION_BROWSER_TRIGGER_ARCHIVING, 0); + + $this->runApiTests($api, $params); + + Option::set(Rules::OPTION_BROWSER_TRIGGER_ARCHIVING, 1); + } + + public function getApiForTestingBrowserArchivingDisabled() + { + $idSite = self::$fixture->idSite; + $segments = self::getSegmentsMetadata($onlyWithSuggestedValuesApi = true); + + $apiForTesting = array(); + foreach ($segments as $segment) { + $apiForTesting[] = $this->getApiForTestingForSegment($idSite, $segment); + } + + return $apiForTesting; + } + + /** * @param $idSite * @param $segment * @return array @@ -206,7 +247,7 @@ class AutoSuggestAPITest extends SystemTestCase $this->assertGreaterThan($minimumSegmentsToTest, self::$processed, $message); } - public static function getSegmentsMetadata() + public static function getSegmentsMetadata($onlyWithSuggestedValuesApi = false) { // Refresh cache for CustomVariables\Model Cache::clearCacheGeneral(); @@ -232,6 +273,9 @@ class AutoSuggestAPITest extends SystemTestCase if ($segment->isInternal()) { continue; } + if ($onlyWithSuggestedValuesApi && !$segment->getSuggestedValuesApi()) { + continue; + } $segments[] = $segment->getSegment(); } } diff --git a/plugins/Actions/Columns/ClickedUrl.php b/plugins/Actions/Columns/ClickedUrl.php index cc74ad45f6..70a3c4fc51 100644 --- a/plugins/Actions/Columns/ClickedUrl.php +++ b/plugins/Actions/Columns/ClickedUrl.php @@ -20,6 +20,7 @@ class ClickedUrl extends ActionDimension protected $nameSingular = 'Actions_ColumnClickedURL'; protected $namePlural = 'Actions_ColumnClickedURLs'; protected $category = 'General_Actions'; + protected $suggestedValuesApi = 'Actions.getOutlinks'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; protected $type = self::TYPE_URL; diff --git a/plugins/Actions/Columns/DownloadUrl.php b/plugins/Actions/Columns/DownloadUrl.php index 62a63157db..f3a91649a8 100644 --- a/plugins/Actions/Columns/DownloadUrl.php +++ b/plugins/Actions/Columns/DownloadUrl.php @@ -20,6 +20,7 @@ class DownloadUrl extends ActionDimension protected $namePlural = 'Actions_ColumnDownloadURLs'; protected $columnName = 'idaction_url'; protected $category = 'General_Actions'; + protected $suggestedValuesApi = 'Actions.getDownloads'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; protected $type = self::TYPE_URL; diff --git a/plugins/Actions/Columns/EntryPageTitle.php b/plugins/Actions/Columns/EntryPageTitle.php index 47741de58c..e6de18c507 100644 --- a/plugins/Actions/Columns/EntryPageTitle.php +++ b/plugins/Actions/Columns/EntryPageTitle.php @@ -21,6 +21,7 @@ class EntryPageTitle extends VisitDimension protected $columnType = 'INTEGER(10) UNSIGNED NULL'; protected $type = self::TYPE_TEXT; protected $segmentName = 'entryPageTitle'; + protected $suggestedValuesApi = 'Actions.getEntryPageTitles'; protected $nameSingular = 'Actions_ColumnEntryPageTitle'; protected $namePlural = 'Actions_WidgetEntryPageTitles'; protected $category = 'General_Actions'; diff --git a/plugins/Actions/Columns/EntryPageUrl.php b/plugins/Actions/Columns/EntryPageUrl.php index a44a1df0bb..c54be5b541 100644 --- a/plugins/Actions/Columns/EntryPageUrl.php +++ b/plugins/Actions/Columns/EntryPageUrl.php @@ -22,6 +22,7 @@ class EntryPageUrl extends VisitDimension protected $segmentName = 'entryPageUrl'; protected $nameSingular = 'Actions_ColumnEntryPageURL'; protected $namePlural = 'Actions_ColumnEntryPageURLs'; + protected $suggestedValuesApi = 'Actions.getEntryPageUrls'; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; protected $type = self::TYPE_URL; diff --git a/plugins/Actions/Columns/ExitPageTitle.php b/plugins/Actions/Columns/ExitPageTitle.php index 4cc417c968..cacaeab388 100644 --- a/plugins/Actions/Columns/ExitPageTitle.php +++ b/plugins/Actions/Columns/ExitPageTitle.php @@ -23,6 +23,7 @@ class ExitPageTitle extends VisitDimension protected $nameSingular = 'Actions_ColumnExitPageTitle'; protected $namePlural = 'Actions_WidgetExitPageTitles'; protected $category = 'General_Actions'; + protected $suggestedValuesApi = 'Actions.getExitPageTitles'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; protected $type = self::TYPE_TEXT; diff --git a/plugins/Actions/Columns/ExitPageUrl.php b/plugins/Actions/Columns/ExitPageUrl.php index 42514a8bc2..2e4386a118 100644 --- a/plugins/Actions/Columns/ExitPageUrl.php +++ b/plugins/Actions/Columns/ExitPageUrl.php @@ -27,6 +27,7 @@ class ExitPageUrl extends VisitDimension protected $nameSingular = 'Actions_ColumnExitPageURL'; protected $namePlural = 'Actions_ColumnExitPageURLs'; protected $category = 'General_Actions'; + protected $suggestedValuesApi = 'Actions.getExitPageUrls'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; public function configureMetrics(MetricsList $metricsList, DimensionMetricFactory $dimensionMetricFactory) diff --git a/plugins/Actions/Columns/PageTitle.php b/plugins/Actions/Columns/PageTitle.php index 502744126d..8428c9d8c2 100644 --- a/plugins/Actions/Columns/PageTitle.php +++ b/plugins/Actions/Columns/PageTitle.php @@ -22,6 +22,7 @@ class PageTitle extends ActionDimension protected $nameSingular = 'Goals_PageTitle'; protected $namePlural = 'Actions_WidgetPageTitles'; protected $category = 'General_Actions'; + protected $suggestedValuesApi = 'Actions.getPageTitles'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; public function getDbColumnJoin() diff --git a/plugins/Actions/Columns/PageUrl.php b/plugins/Actions/Columns/PageUrl.php index 7728a49a5a..d12086cff5 100644 --- a/plugins/Actions/Columns/PageUrl.php +++ b/plugins/Actions/Columns/PageUrl.php @@ -25,6 +25,7 @@ class PageUrl extends ActionDimension protected $acceptValues = 'All these segments must be URL encoded, for example: http%3A%2F%2Fexample.com%2Fpath%2Fpage%3Fquery'; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; + protected $suggestedValuesApi = 'Actions.getPageUrls'; public function getDbColumnJoin() { diff --git a/plugins/Actions/DataTable/Filter/Actions.php b/plugins/Actions/DataTable/Filter/Actions.php index 29bfe1bf49..a17a7b4920 100644 --- a/plugins/Actions/DataTable/Filter/Actions.php +++ b/plugins/Actions/DataTable/Filter/Actions.php @@ -13,6 +13,7 @@ use Piwik\Config; use Piwik\DataTable\BaseFilter; use Piwik\DataTable\Row; use Piwik\DataTable; +use Piwik\Plugins\Actions\ArchivingHelper; use Piwik\Tracker\Action; class Actions extends BaseFilter @@ -54,6 +55,9 @@ class Actions extends BaseFilter } } + $notDefinedUrl = ArchivingHelper::getUnknownActionName(Action::TYPE_PAGE_URL); + $notDefinedTitle = ArchivingHelper::getUnknownActionName(Action::TYPE_PAGE_TITLE); + foreach ($dataTable->getRows() as $row) { if (!$row->isSummaryRow()) { $url = $row->getMetadata('url'); @@ -75,10 +79,19 @@ class Actions extends BaseFilter if ($row->getIdSubDataTable()) { $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim($label)))); } else { - $row->setMetadata('segmentValue', urlencode(trim($label))); + $notDefinedName = ArchivingHelper::getUnknownActionName(Action::TYPE_PAGE_TITLE); + if (trim($label) == $notDefinedName) { + $row->setMetadata('segmentValue', ''); + } else { + $row->setMetadata('segmentValue', urlencode(trim($label))); + } } } else if ($this->actionType == Action::TYPE_PAGE_URL && $urlPrefix) { // folder for older data w/ no folder URL metadata - $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($urlPrefix . '/' . $label))); + if ($label === $notDefinedUrl) { + $row->setMetadata('segmentValue', ''); + } else { + $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($urlPrefix . '/' . $label))); + } } } diff --git a/plugins/Contents/Columns/ContentName.php b/plugins/Contents/Columns/ContentName.php index b327918a77..a56b49f835 100644 --- a/plugins/Contents/Columns/ContentName.php +++ b/plugins/Contents/Columns/ContentName.php @@ -24,6 +24,7 @@ class ContentName extends ActionDimension protected $nameSingular = 'Contents_ContentName'; protected $namePlural = 'Contents_ContentNames'; protected $acceptValues = 'The name of a content block, for instance "Ad Sale"'; + protected $suggestedValuesApi = 'Contents.getContentNames'; protected $type = self::TYPE_TEXT; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; diff --git a/plugins/Contents/Columns/ContentPiece.php b/plugins/Contents/Columns/ContentPiece.php index 35ac1df8cc..c1d5d3d444 100644 --- a/plugins/Contents/Columns/ContentPiece.php +++ b/plugins/Contents/Columns/ContentPiece.php @@ -23,6 +23,7 @@ class ContentPiece extends ActionDimension protected $nameSingular = 'Contents_ContentPiece'; protected $namePlural = 'Contents_ContentPieces'; protected $acceptValues = 'The actual content. For instance "ad.jpg" or "My text ad"'; + protected $suggestedValuesApi = 'Contents.getContentPieces'; protected $type = self::TYPE_TEXT; protected $category = 'General_Actions'; protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment'; diff --git a/plugins/Events/Columns/EventAction.php b/plugins/Events/Columns/EventAction.php index 791a45e52e..166d0b03b7 100644 --- a/plugins/Events/Columns/EventAction.php +++ b/plugins/Events/Columns/EventAction.php @@ -24,6 +24,7 @@ class EventAction extends ActionDimension protected $segmentName = 'eventAction'; protected $nameSingular = 'Events_EventAction'; protected $namePlural = 'Events_EventActions'; + protected $suggestedValuesApi = 'Events.getAction'; protected $category = 'Events_Events'; protected $sqlFilter = '\Piwik\Tracker\TableLogAction::getIdActionFromSegment'; diff --git a/plugins/Events/Columns/EventCategory.php b/plugins/Events/Columns/EventCategory.php index fe417d2db8..98c717e689 100644 --- a/plugins/Events/Columns/EventCategory.php +++ b/plugins/Events/Columns/EventCategory.php @@ -24,6 +24,7 @@ class EventCategory extends ActionDimension protected $category = 'Events_Events'; protected $sqlFilter = '\Piwik\Tracker\TableLogAction::getIdActionFromSegment'; protected $segmentName = 'eventCategory'; + protected $suggestedValuesApi = 'Events.getCategory'; protected $nameSingular = 'Events_EventCategory'; protected $namePlural = 'Events_EventCategories'; diff --git a/plugins/Events/Columns/EventName.php b/plugins/Events/Columns/EventName.php index 720bb700c1..62a441e601 100644 --- a/plugins/Events/Columns/EventName.php +++ b/plugins/Events/Columns/EventName.php @@ -22,6 +22,8 @@ class EventName extends ActionDimension protected $category = 'Events_Events'; protected $sqlFilter = '\Piwik\Tracker\TableLogAction::getIdActionFromSegment'; protected $segmentName = 'eventName'; + protected $suggestedValuesApi = 'Events.getName'; + protected $nameSingular = 'Events_EventName'; protected $namePlural = 'Events_EventNames'; diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 6e16854e66..12954e5733 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -18,7 +18,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.135</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> 404/URL = http://hello.example.com/hello/world/6,681965</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 01f878da0f..3b3ed74c90 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -18,7 +18,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.283</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> Liberate Web Analytics - Analytics - Piwik</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index eb0e3575b3..417116a98c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -231,7 +231,7 @@ </result> <result prettyDate="Monday, January 4, 2010"> <row> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result prettyDate="Tuesday, January 5, 2010"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml index 1ddf2f199e..f54882d49f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml @@ -234,7 +234,7 @@ <result prettyDate="Monday, January 4, 2010"> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result prettyDate="Tuesday, January 5, 2010"> @@ -248,7 +248,7 @@ </row> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result prettyDate="Wednesday, January 6, 2010"> @@ -262,7 +262,7 @@ </row> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result prettyDate="Thursday, January 7, 2010"> @@ -276,7 +276,7 @@ </row> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result prettyDate="Friday, January 8, 2010"> @@ -290,7 +290,7 @@ </row> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result prettyDate="Saturday, January 9, 2010"> @@ -304,7 +304,7 @@ </row> <row> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> </reportMetadata> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml index 021d07a1f3..9d54b35914 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml @@ -49,7 +49,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-01-05"> @@ -419,7 +419,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.353</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> Website 2 page view</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml index 1a6e5ead03..0c22859db7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml @@ -114,7 +114,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-02" /> @@ -144,7 +144,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.353</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> Website 2 page view</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml index fc8107c125..c30a32105b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml @@ -116,7 +116,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-01-11,2010-01-17"> @@ -214,7 +214,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.353</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> Website 2 page view</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml index e09e53728e..ee252379cf 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml @@ -114,7 +114,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2011" /> @@ -144,7 +144,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.353</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> <row> <label> Website 2 page view</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml index c67ff3eb70..372aeb3055 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml @@ -79,7 +79,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-05"> @@ -151,7 +151,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-06"> @@ -223,7 +223,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-07"> @@ -295,7 +295,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-08"> @@ -367,7 +367,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-09"> @@ -439,7 +439,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> </result> @@ -493,7 +493,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.203</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-05" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml index a0d8de3bc9..23fc8c0a72 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml @@ -49,7 +49,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/thankyou</label> @@ -159,7 +159,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.203</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml index b0376cc65c..4c1fe87c7e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml @@ -79,7 +79,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/index.htm</label> @@ -200,7 +200,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-18,2010-01-24" /> @@ -258,7 +258,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.203</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-11,2010-01-17" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml index f5373a761c..f332293024 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml @@ -49,7 +49,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/thankyou</label> @@ -159,7 +159,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.203</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2011" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml index 94390fbb61..910aa54d8a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml @@ -48,7 +48,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-01-05"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml index 702c72e2c3..cdf859f7a8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml @@ -113,7 +113,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-02" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml index 4976d9ea78..8f00a83e06 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml @@ -115,7 +115,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2010-01-11,2010-01-17"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml index 4353126990..eef2514cf9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml @@ -113,7 +113,7 @@ <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result> <result date="2011" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml index 2961fa503b..3ae33a53c1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml @@ -78,7 +78,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-05"> @@ -150,7 +150,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-06"> @@ -222,7 +222,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-07"> @@ -294,7 +294,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-08"> @@ -366,7 +366,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-09"> @@ -438,7 +438,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml index 70f1d3e5d6..d5ad6e29a1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml @@ -48,7 +48,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/thankyou</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml index 2dc8e54f60..f72062d9c8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml @@ -78,7 +78,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/index.htm</label> @@ -199,7 +199,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> </result> <result date="2010-01-18,2010-01-24" /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml index b7c0fcb810..9d3b80c1dd 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml @@ -48,7 +48,7 @@ <exit_rate>0%</exit_rate> <avg_time_generation>0.223</avg_time_generation> <url /> - <segment>pageUrl=^http%253A%252F%252Fpiwik.net%252FPage%2BURL%2Bnot%2Bdefined</segment> + <segment>pageUrl==</segment> </row> <row> <label>/thankyou</label> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml index 43caec66cd..814fe0e0fa 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml @@ -14,6 +14,6 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> - <segment>pageTitle==Page%2BName%2Bnot%2Bdefined</segment> + <segment>pageTitle==</segment> </row> </result>
\ No newline at end of file |