diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-04-15 12:55:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 12:55:36 +0300 |
| commit | c4eca98199cdf18a4cd969c5495be58a0c348b92 (patch) | |
| tree | c07d130f0f82bf430e9efb59d156a277ec89bbe0 /tests | |
| parent | 5c7f8498d0e8a4f55ff1a4bd7aab3a3be20a8c31 (diff) | |
Rename interaction_position to pageview_position (#15812)
* rename db column interaction_position to pageview_position
* allow storing bigger int values in position fields
* updates tests & expected files
* adds changelog
* Update plugins/Actions/Columns/VisitTotalInteractions.php
* update submodules
Diffstat (limited to 'tests')
28 files changed, 351 insertions, 349 deletions
diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 1e8604eab0..a2b25adb02 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -102,6 +102,8 @@ class BackwardsCompatibility1XTest extends SystemTestCase 'entry_sum_visit_length', 'sum_visit_length', 'nb_visits_converted', + 'interactionPosition', + 'pageviewPosition', ], ); diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 978cde6a3b..14013ab8f5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -17,7 +17,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -144,7 +144,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -273,7 +273,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -294,7 +294,7 @@ <bandwidth /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -315,7 +315,7 @@ <bandwidth /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -336,7 +336,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -357,7 +357,7 @@ <bandwidth /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -377,7 +377,7 @@ <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -506,7 +506,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -636,7 +636,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Welcome!</title> <subtitle>http://example.org/webradio</subtitle> <icon /> @@ -671,7 +671,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -698,7 +698,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -733,7 +733,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -760,7 +760,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -796,7 +796,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -823,7 +823,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -859,7 +859,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -886,7 +886,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -913,7 +913,7 @@ <bandwidth /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -941,7 +941,7 @@ <bandwidth /> <timeSpent>1620</timeSpent> <timeSpentPretty>27 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -970,7 +970,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>666</generationTimeMilliseconds> <generationTime>0.67s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Movie Theater</title> <subtitle>http://example.org/movies</subtitle> <icon /> @@ -990,7 +990,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1011,7 +1011,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1032,7 +1032,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1053,7 +1053,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1074,7 +1074,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1093,7 +1093,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1221,7 +1221,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1344,7 +1344,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1469,7 +1469,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1490,7 +1490,7 @@ <bandwidth /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1511,7 +1511,7 @@ <bandwidth /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1532,7 +1532,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1553,7 +1553,7 @@ <bandwidth /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1573,7 +1573,7 @@ <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1698,7 +1698,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1823,7 +1823,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1850,7 +1850,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1877,7 +1877,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1904,7 +1904,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1931,7 +1931,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1958,7 +1958,7 @@ <bandwidth /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1986,7 +1986,7 @@ <bandwidth /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2015,7 +2015,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>666</generationTimeMilliseconds> <generationTime>0.67s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Movie Theater</title> <subtitle>http://example.org/movies</subtitle> <icon /> @@ -2035,7 +2035,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2056,7 +2056,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2077,7 +2077,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2098,7 +2098,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2119,7 +2119,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2138,7 +2138,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 8dff814a96..5c26af5bc8 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -17,7 +17,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -140,7 +140,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -265,7 +265,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -286,7 +286,7 @@ <bandwidth /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -307,7 +307,7 @@ <bandwidth /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -328,7 +328,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -349,7 +349,7 @@ <bandwidth /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -369,7 +369,7 @@ <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -494,7 +494,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -619,7 +619,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -646,7 +646,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -673,7 +673,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -700,7 +700,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -727,7 +727,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -754,7 +754,7 @@ <bandwidth /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -782,7 +782,7 @@ <bandwidth /> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -811,7 +811,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>666</generationTimeMilliseconds> <generationTime>0.67s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Movie Theater</title> <subtitle>http://example.org/movies</subtitle> <icon /> @@ -831,7 +831,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -852,7 +852,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -873,7 +873,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -894,7 +894,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -915,7 +915,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -934,7 +934,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1058,7 +1058,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Purchase</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1185,7 +1185,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1314,7 +1314,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1335,7 +1335,7 @@ <bandwidth /> <timeSpent>420</timeSpent> <timeSpentPretty>7 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1356,7 +1356,7 @@ <bandwidth /> <timeSpent>900</timeSpent> <timeSpentPretty>15 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1377,7 +1377,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1398,7 +1398,7 @@ <bandwidth /> <timeSpent>720</timeSpent> <timeSpentPretty>12 min 0s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1418,7 +1418,7 @@ <eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventCategory> <eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1547,7 +1547,7 @@ <eventCategory>Movie</eventCategory> <eventAction>Search</eventAction> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1677,7 +1677,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Welcome!</title> <subtitle>http://example.org/webradio</subtitle> <icon /> @@ -1712,7 +1712,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1739,7 +1739,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -1774,7 +1774,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1801,7 +1801,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -1837,7 +1837,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1864,7 +1864,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Event</title> <subtitle>Category: "CategoryTriggersGoal here', Action: "This is an event without a URL"</subtitle> <icon>plugins/Morpheus/images/event.png</icon> @@ -1900,7 +1900,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1927,7 +1927,7 @@ <bandwidth /> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1954,7 +1954,7 @@ <bandwidth /> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1982,7 +1982,7 @@ <bandwidth /> <timeSpent>1620</timeSpent> <timeSpentPretty>27 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2011,7 +2011,7 @@ <timeSpentPretty>1 min 0s</timeSpentPretty> <generationTimeMilliseconds>666</generationTimeMilliseconds> <generationTime>0.67s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Movie Theater</title> <subtitle>http://example.org/movies</subtitle> <icon /> @@ -2031,7 +2031,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2052,7 +2052,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2073,7 +2073,7 @@ <bandwidth /> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2094,7 +2094,7 @@ <bandwidth /> <timeSpent>120</timeSpent> <timeSpentPretty>2 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2115,7 +2115,7 @@ <bandwidth /> <timeSpent>1320</timeSpent> <timeSpentPretty>22 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -2134,7 +2134,7 @@ <eventCategory>Movie</eventCategory> <eventAction>play25%</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index d569fae4a7..e02ed919e1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -18,7 +18,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>292</generationTimeMilliseconds> <generationTime>0.29s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -171,7 +171,7 @@ <bandwidth>43</bandwidth> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Changelog Archive - Analytics - Piwik</title> <subtitle>http://piwik.org/changelog/</subtitle> <icon /> @@ -209,7 +209,7 @@ <pageId>48</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Contact the Piwik team - Analytics - Piwik</title> <subtitle>http://piwik.org/contact/</subtitle> <icon /> @@ -330,7 +330,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>413</generationTimeMilliseconds> <generationTime>0.41s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</title> <subtitle>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</subtitle> <icon /> @@ -495,7 +495,7 @@ <bandwidth>43</bandwidth> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -533,7 +533,7 @@ <pageId>46</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>What is Piwik? - Analytics - Piwik</title> <subtitle>http://piwik.org/what-is-piwisk/</subtitle> <icon /> @@ -673,7 +673,7 @@ <pageId>45</pageId> <bandwidth>43</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -815,7 +815,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>391</generationTimeMilliseconds> <generationTime>0.39s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Integrate Piwik into your Rails Application - Analytics - Piwik</title> <subtitle>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</subtitle> <icon /> @@ -978,7 +978,7 @@ <pageId>42</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Log Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/log-analytics/</subtitle> <icon /> @@ -1131,7 +1131,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>119</generationTimeMilliseconds> <generationTime>0.12s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</title> <subtitle>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</subtitle> <icon /> @@ -1276,7 +1276,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>145</generationTimeMilliseconds> <generationTime>0.15s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Log Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/log-analytics/</subtitle> <icon /> @@ -1443,7 +1443,7 @@ <timeSpentPretty>2s</timeSpentPretty> <generationTimeMilliseconds>182</generationTimeMilliseconds> <generationTime>0.18s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -1485,7 +1485,7 @@ <timeSpentPretty>7s</timeSpentPretty> <generationTimeMilliseconds>113</generationTimeMilliseconds> <generationTime>0.11s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Download - Analytics - Piwik</title> <subtitle>http://piwik.org/download/</subtitle> <icon /> @@ -1508,7 +1508,7 @@ <pageId>38</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1642,7 +1642,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>134</generationTimeMilliseconds> <generationTime>0.13s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Hello Installing Piwik - Analytics - Piwik</title> <subtitle>http://piwik.org/docs/installation/</subtitle> <icon /> @@ -1799,7 +1799,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>58</generationTimeMilliseconds> <generationTime>0.06s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -1958,7 +1958,7 @@ <timeSpentPretty>0s</timeSpentPretty> <generationTimeMilliseconds>123</generationTimeMilliseconds> <generationTime>0.12s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -2000,7 +2000,7 @@ <timeSpentPretty>0s</timeSpentPretty> <generationTimeMilliseconds>120</generationTimeMilliseconds> <generationTime>0.12s</generationTime> - <interactionPosition>5</interactionPosition> + <pageviewPosition>5</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -2027,7 +2027,7 @@ <timeSpentPretty>52s</timeSpentPretty> <generationTimeMilliseconds>23</generationTimeMilliseconds> <generationTime>0.02s</generationTime> - <interactionPosition>9</interactionPosition> + <pageviewPosition>9</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -2054,7 +2054,7 @@ <timeSpentPretty>50s</timeSpentPretty> <generationTimeMilliseconds>234</generationTimeMilliseconds> <generationTime>0.23s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> <icon /> @@ -2081,7 +2081,7 @@ <timeSpentPretty>49s</timeSpentPretty> <generationTimeMilliseconds>294</generationTimeMilliseconds> <generationTime>0.29s</generationTime> - <interactionPosition>6</interactionPosition> + <pageviewPosition>6</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> <icon /> @@ -2108,7 +2108,7 @@ <timeSpentPretty>26s</timeSpentPretty> <generationTimeMilliseconds>237</generationTimeMilliseconds> <generationTime>0.24s</generationTime> - <interactionPosition>10</interactionPosition> + <pageviewPosition>10</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> <icon /> @@ -2135,7 +2135,7 @@ <timeSpentPretty>26s</timeSpentPretty> <generationTimeMilliseconds>1324</generationTimeMilliseconds> <generationTime>1.32s</generationTime> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> <icon /> @@ -2162,7 +2162,7 @@ <timeSpentPretty>7s</timeSpentPretty> <generationTimeMilliseconds>624</generationTimeMilliseconds> <generationTime>0.62s</generationTime> - <interactionPosition>7</interactionPosition> + <pageviewPosition>7</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> <icon /> @@ -2189,7 +2189,7 @@ <timeSpentPretty>8s</timeSpentPretty> <generationTimeMilliseconds>543</generationTimeMilliseconds> <generationTime>0.54s</generationTime> - <interactionPosition>4</interactionPosition> + <pageviewPosition>4</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> <icon /> @@ -2214,7 +2214,7 @@ <bandwidth /> <generationTimeMilliseconds>343</generationTimeMilliseconds> <generationTime>0.34s</generationTime> - <interactionPosition>8</interactionPosition> + <pageviewPosition>8</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> <icon /> @@ -2331,7 +2331,7 @@ <bandwidth>182</bandwidth> <generationTimeMilliseconds>1</generationTimeMilliseconds> <generationTime>0.001s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/view/my/file.html</subtitle> <icon /> @@ -2461,7 +2461,7 @@ <pageId>99</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> <icon /> @@ -2593,7 +2593,7 @@ <bandwidth>355</bandwidth> <timeSpent>240</timeSpent> <timeSpentPretty>4 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</title> <subtitle>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</subtitle> <icon /> @@ -2631,7 +2631,7 @@ <pageId>85</pageId> <bandwidth>5609</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title /> <subtitle>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</subtitle> <icon /> @@ -2748,7 +2748,7 @@ <bandwidth /> <generationTimeMilliseconds>359</generationTimeMilliseconds> <generationTime>0.36s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> <icon /> @@ -2894,7 +2894,7 @@ <timeSpentPretty>0s</timeSpentPretty> <generationTimeMilliseconds>109</generationTimeMilliseconds> <generationTime>0.11s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://xzy.example.com/Products/theProduct</subtitle> <icon /> @@ -2934,7 +2934,7 @@ <bandwidth /> <generationTimeMilliseconds>109</generationTimeMilliseconds> <generationTime>0.11s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title /> <subtitle>http://xzy.example.com/Products/theProduct</subtitle> <icon /> @@ -3063,7 +3063,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> <subtitle>http://example.hello.com/Topic/hw43061</subtitle> <icon /> @@ -3101,7 +3101,7 @@ <pageId>92</pageId> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</title> <subtitle>http://example.hello.com/Topic/hw43061</subtitle> <icon /> @@ -3230,7 +3230,7 @@ <bandwidth /> <generationTimeMilliseconds>359</generationTimeMilliseconds> <generationTime>0.36s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</title> <subtitle>http://hello.example.com/hello/world/6,681965</subtitle> <icon /> @@ -3364,7 +3364,7 @@ <timeSpentPretty>0s</timeSpentPretty> <generationTimeMilliseconds>359</generationTimeMilliseconds> <generationTime>0.36s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</title> <subtitle>http://hello.example.com/hello/world/6,681965</subtitle> <icon /> @@ -3397,7 +3397,7 @@ <bandwidth /> <generationTimeMilliseconds>359</generationTimeMilliseconds> <generationTime>0.36s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> <icon /> @@ -3527,7 +3527,7 @@ <pageId>30</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -3682,7 +3682,7 @@ <pageId>31</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Piwik Forums</title> <subtitle>http://forum.piwik.org/register.php?0,approve=9a94a02145599</subtitle> <icon /> @@ -3847,7 +3847,7 @@ <bandwidth>915</bandwidth> <generationTimeMilliseconds>1</generationTimeMilliseconds> <generationTime>0.001s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> @@ -3979,7 +3979,7 @@ <bandwidth>267</bandwidth> <generationTimeMilliseconds>9</generationTimeMilliseconds> <generationTime>0.009s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/api/fútbol-user-agent</subtitle> <icon /> @@ -4110,7 +4110,7 @@ <eventCategory>cloudfront_rtmp</eventCategory> <eventAction>play</eventAction> <bandwidth>3914</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -4227,7 +4227,7 @@ <eventCategory>cloudfront_rtmp</eventCategory> <eventAction>connect</eventAction> <bandwidth>2014</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -4342,7 +4342,7 @@ <pageId>28</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -4476,7 +4476,7 @@ <pageId>29</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -4612,7 +4612,7 @@ <bandwidth>3574</bandwidth> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</title> <subtitle>http://piwik.net/moved-permanently</subtitle> <icon /> @@ -4650,7 +4650,7 @@ <pageId>27</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</title> <subtitle>http://piwik.net/temp-redirect</subtitle> <icon /> @@ -4771,7 +4771,7 @@ <bandwidth>3574</bandwidth> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -4796,7 +4796,7 @@ <bandwidth>3574</bandwidth> <timeSpent>61</timeSpent> <timeSpentPretty>1 min 1s</timeSpentPretty> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -4819,7 +4819,7 @@ <pageId>25</pageId> <bandwidth>3574</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -4938,7 +4938,7 @@ <pageId>22</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> @@ -5072,7 +5072,7 @@ <pageId>21</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</title> <subtitle>http://piwik.net/to-an-error</subtitle> <icon /> @@ -5206,7 +5206,7 @@ <pageId>18</pageId> <bandwidth>4324023</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -5325,7 +5325,7 @@ <pageId>20</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F</title> <subtitle>http://piwik.net/this/is/not/the/page/i/am/looking/for/</subtitle> <icon /> @@ -5459,7 +5459,7 @@ <pageId>19</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> @@ -5593,7 +5593,7 @@ <pageId>17</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/hosting/</subtitle> <icon /> @@ -5723,7 +5723,7 @@ <pageId>16</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/how-to-install/</subtitle> <icon /> @@ -5853,7 +5853,7 @@ <pageId>15</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</subtitle> <icon /> @@ -5983,7 +5983,7 @@ <pageId>14</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/intranet-analytics/</subtitle> <icon /> @@ -6113,7 +6113,7 @@ <pageId>13</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> <icon /> @@ -6243,7 +6243,7 @@ <pageId>12</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> <icon /> @@ -6373,7 +6373,7 @@ <pageId>11</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/how-to/</subtitle> <icon /> @@ -6503,7 +6503,7 @@ <pageId>10</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/newsletter/</subtitle> <icon /> @@ -6633,7 +6633,7 @@ <pageId>95</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://included3.com/blog/category/meta/</subtitle> <icon /> @@ -6763,7 +6763,7 @@ <pageId>97</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://included1.com/blog/category/meta/</subtitle> <icon /> @@ -6893,7 +6893,7 @@ <pageId>9</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-users/</subtitle> <icon /> @@ -7023,7 +7023,7 @@ <pageId>8</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/</subtitle> <icon /> @@ -7153,7 +7153,7 @@ <pageId>7</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/translations/</subtitle> <icon /> @@ -7283,7 +7283,7 @@ <pageId>6</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/download/counter/</subtitle> <icon /> @@ -7413,7 +7413,7 @@ <pageId>5</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> @@ -7543,7 +7543,7 @@ <pageId>4</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> <icon /> @@ -7673,7 +7673,7 @@ <pageId>3</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> <icon /> @@ -7803,7 +7803,7 @@ <pageId>2</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> <icon /> @@ -7933,7 +7933,7 @@ <pageId>96</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://www.included4.com/blog/category/meta/</subtitle> <icon /> @@ -8063,7 +8063,7 @@ <pageId>98</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://www.included2.com/blog/category/meta/</subtitle> <icon /> @@ -8193,7 +8193,7 @@ <pageId>1</pageId> <bandwidth>3574</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index da3d21a6ab..8db84fac40 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -113,7 +113,7 @@ <default_value /> </row> <row> - <column_name>interaction_position</column_name> + <column_name>pageview_position</column_name> <default_value /> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 7083dded59..7d94e82ea2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -18,7 +18,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>292</generationTimeMilliseconds> <generationTime>0.29s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -156,7 +156,7 @@ <bandwidth>43</bandwidth> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Changelog Archive - Analytics - Piwik</title> <subtitle>http://piwik.org/changelog/</subtitle> <icon /> @@ -179,7 +179,7 @@ <pageId>68</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Contact the Piwik team - Analytics - Piwik</title> <subtitle>http://piwik.org/contact/</subtitle> <icon /> @@ -300,7 +300,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>413</generationTimeMilliseconds> <generationTime>0.41s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</title> <subtitle>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</subtitle> <icon /> @@ -450,7 +450,7 @@ <bandwidth>43</bandwidth> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -473,7 +473,7 @@ <pageId>66</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>What is Piwik? - Analytics - Piwik</title> <subtitle>http://piwik.org/what-is-piwisk/</subtitle> <icon /> @@ -613,7 +613,7 @@ <pageId>65</pageId> <bandwidth>43</bandwidth> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -755,7 +755,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>391</generationTimeMilliseconds> <generationTime>0.39s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Integrate Piwik into your Rails Application - Analytics - Piwik</title> <subtitle>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</subtitle> <icon /> @@ -903,7 +903,7 @@ <pageId>62</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Log Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/log-analytics/</subtitle> <icon /> @@ -1041,7 +1041,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>119</generationTimeMilliseconds> <generationTime>0.12s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</title> <subtitle>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</subtitle> <icon /> @@ -1171,7 +1171,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>145</generationTimeMilliseconds> <generationTime>0.15s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Log Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/log-analytics/</subtitle> <icon /> @@ -1323,7 +1323,7 @@ <timeSpentPretty>2s</timeSpentPretty> <generationTimeMilliseconds>182</generationTimeMilliseconds> <generationTime>0.18s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -1350,7 +1350,7 @@ <timeSpentPretty>7s</timeSpentPretty> <generationTimeMilliseconds>113</generationTimeMilliseconds> <generationTime>0.11s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Download - Analytics - Piwik</title> <subtitle>http://piwik.org/download/</subtitle> <icon /> @@ -1373,7 +1373,7 @@ <pageId>58</pageId> <bandwidth>43</bandwidth> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1507,7 +1507,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>134</generationTimeMilliseconds> <generationTime>0.13s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Hello Installing Piwik - Analytics - Piwik</title> <subtitle>http://piwik.org/docs/installation/</subtitle> <icon /> @@ -1649,7 +1649,7 @@ <bandwidth>43</bandwidth> <generationTimeMilliseconds>58</generationTimeMilliseconds> <generationTime>0.06s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Liberate Web Analytics - Analytics - Piwik</title> <subtitle>http://piwik.org/</subtitle> <icon /> @@ -1789,7 +1789,7 @@ <pageId>50</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -1929,7 +1929,7 @@ <pageId>51</pageId> <bandwidth>43</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Piwik Forums</title> <subtitle>http://forum.piwik.org/register.php?0,approve=9a94a02145599</subtitle> <icon /> @@ -2079,7 +2079,7 @@ <bandwidth>43</bandwidth> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Looking at Electronics & Cameras page with a page level custom variable</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -2104,7 +2104,7 @@ <bandwidth>43</bandwidth> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Another Product page with no category</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -2131,7 +2131,7 @@ <pageId>53</pageId> <bandwidth>43</bandwidth> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>Looking at Electronics & Cameras page with a page level custom variable</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> 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 bd605241db..a151ee03a2 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 @@ -18,7 +18,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -54,7 +54,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>48</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -88,7 +88,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -107,7 +107,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -125,7 +125,7 @@ <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -257,7 +257,7 @@ <pageId>45</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -414,7 +414,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -463,7 +463,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -482,7 +482,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -500,7 +500,7 @@ <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> 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 3d746bcaf0..baa8d54fbe 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 @@ -16,7 +16,7 @@ <pageId>40</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -173,7 +173,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -209,7 +209,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>36</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -243,7 +243,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -262,7 +262,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -280,7 +280,7 @@ <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -412,7 +412,7 @@ <pageId>34</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> 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 80a26df20a..4159288fcc 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 @@ -16,7 +16,7 @@ <pageId>95</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -155,7 +155,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -191,7 +191,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>48</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -225,7 +225,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -244,7 +244,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -262,7 +262,7 @@ <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -394,7 +394,7 @@ <pageId>45</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -551,7 +551,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -600,7 +600,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -619,7 +619,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -637,7 +637,7 @@ <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -769,7 +769,7 @@ <pageId>40</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -926,7 +926,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -962,7 +962,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>36</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -996,7 +996,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1015,7 +1015,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -1033,7 +1033,7 @@ <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1165,7 +1165,7 @@ <pageId>34</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> 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 80a26df20a..4159288fcc 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 @@ -16,7 +16,7 @@ <pageId>95</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -155,7 +155,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -191,7 +191,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>48</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -225,7 +225,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -244,7 +244,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -262,7 +262,7 @@ <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -394,7 +394,7 @@ <pageId>45</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -551,7 +551,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -600,7 +600,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -619,7 +619,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -637,7 +637,7 @@ <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -769,7 +769,7 @@ <pageId>40</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -926,7 +926,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -962,7 +962,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>36</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -996,7 +996,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1015,7 +1015,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -1033,7 +1033,7 @@ <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1165,7 +1165,7 @@ <pageId>34</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> 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 40c34f4bbf..b3f9dbaaed 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -16,7 +16,7 @@ <pageId>95</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -155,7 +155,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -191,7 +191,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>48</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -225,7 +225,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -244,7 +244,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -262,7 +262,7 @@ <eventCategory>Cat8</eventCategory> <eventAction>Action8</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -394,7 +394,7 @@ <pageId>45</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -551,7 +551,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -600,7 +600,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -619,7 +619,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -637,7 +637,7 @@ <eventCategory>Cat7</eventCategory> <eventAction>Action7</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -769,7 +769,7 @@ <pageId>40</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -926,7 +926,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -962,7 +962,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>36</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -996,7 +996,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1015,7 +1015,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -1033,7 +1033,7 @@ <eventCategory>Cat6</eventCategory> <eventAction>Action6</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1165,7 +1165,7 @@ <pageId>34</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -1322,7 +1322,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -1371,7 +1371,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1390,7 +1390,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -1408,7 +1408,7 @@ <eventCategory>Cat5</eventCategory> <eventAction>Action5</eventAction> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> @@ -1540,7 +1540,7 @@ <pageId>29</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>It's <script> pitch black...</title> <subtitle>http://piwik.net/grue/lair</subtitle> <icon /> @@ -1697,7 +1697,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Space Quest XII</title> <subtitle>http://piwik.net/space/quest/iv</subtitle> <icon /> @@ -1733,7 +1733,7 @@ <siteSearchKeyword>Bring on the party</siteSearchKeyword> <siteSearchCategory>CAT</siteSearchCategory> <siteSearchCount>24</siteSearchCount> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -1767,7 +1767,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -1786,7 +1786,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -1804,7 +1804,7 @@ <eventCategory>Cat4</eventCategory> <eventAction>Action4</eventAction> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/event.png</icon> <iconSVG>plugins/Morpheus/images/event.svg</iconSVG> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index da3d21a6ab..8db84fac40 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -113,7 +113,7 @@ <default_value /> </row> <row> - <column_name>interaction_position</column_name> + <column_name>pageview_position</column_name> <default_value /> </row> <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 9c3978b3c5..552348e2bf 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 @@ -18,7 +18,7 @@ <bandwidth /> <generationTimeMilliseconds>134</generationTimeMilliseconds> <generationTime>0.13s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Checkout/Purchasing...</title> <subtitle>http://example.org/store/purchase.htm</subtitle> <icon /> @@ -159,7 +159,7 @@ <timeSpentPretty>3 min 0s</timeSpentPretty> <generationTimeMilliseconds>234</generationTimeMilliseconds> <generationTime>0.23s</generationTime> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm?parameter=Should display</subtitle> <icon /> @@ -180,7 +180,7 @@ <timeSpentPretty>3 min 0s</timeSpentPretty> <generationTimeMilliseconds>224</generationTimeMilliseconds> <generationTime>0.22s</generationTime> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Second page view - should be registered as URL</title> <subtitle>http://example.org/</subtitle> <icon /> @@ -199,7 +199,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -218,7 +218,7 @@ <bandwidth /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/download.png</icon> <iconSVG>plugins/Morpheus/images/download.svg</iconSVG> <title>Download</title> @@ -237,7 +237,7 @@ <bandwidth /> <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -256,7 +256,7 @@ <bandwidth /> <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -294,7 +294,7 @@ <siteSearchCount /> <generationTimeMilliseconds>812</generationTimeMilliseconds> <generationTime>0.81s</generationTime> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <icon>plugins/Morpheus/images/search.png</icon> <iconSVG>plugins/Morpheus/images/search.svg</iconSVG> <title>Site Search</title> @@ -313,7 +313,7 @@ <bandwidth /> <generationTimeMilliseconds>24</generationTimeMilliseconds> <generationTime>0.02s</generationTime> - <interactionPosition>4</interactionPosition> + <pageviewPosition>4</pageviewPosition> <title>Looking at homepage after site search...</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 7c7733658b..86d99c41c8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -16,7 +16,7 @@ <pageId>2</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://example.org/this%20is%20cool!?filter=<script>alert(1);</script>{"place":{"place":"0c5b2444-70a0-4932-980c-b4dc0d3f02b5"}}</subtitle> <icon /> @@ -140,7 +140,7 @@ <bandwidth /> <timeSpent>1084</timeSpent> <timeSpentPretty>18 min 4s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title! (Page URL contains a HTML entity)</title> <subtitle>http://example.org/this%20is%20cool!?filter=<script>alert(1);</script>{"place":{"place":"0c5b2444-70a0-4932-980c-b4dc0d3f02b5"}}</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 3f1d98ef65..34eedf0067 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -15,7 +15,7 @@ <serverTimePretty>Apr 7, 2013 10:00:00</serverTimePretty> <pageId>1</pageId> <bandwidth>9625</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> @@ -129,7 +129,7 @@ <serverTimePretty>Apr 6, 2013 11:00:00</serverTimePretty> <pageId>2</pageId> <bandwidth>9625</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> @@ -243,7 +243,7 @@ <serverTimePretty>Apr 5, 2013 12:00:00</serverTimePretty> <pageId>3</pageId> <bandwidth>9625</bandwidth> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title /> <subtitle>http://piwik.net/</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml index 6322f8d346..49ccd6b0d8 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml @@ -16,7 +16,7 @@ <pageId>14</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>העלא וועלט</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -140,7 +140,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>hallå världen</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -157,7 +157,7 @@ <pageId>13</pageId> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>halló heimur</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -279,7 +279,7 @@ <pageId>11</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>привет мир</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -401,7 +401,7 @@ <pageId>10</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Dia duit ar domhan</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -525,7 +525,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Hallo welt</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -542,7 +542,7 @@ <pageId>9</pageId> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>¡hola mundo</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -664,7 +664,7 @@ <pageId>7</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Bonjour le monde</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -786,7 +786,7 @@ <pageId>6</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Hello world</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -908,7 +908,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>second page</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -1030,7 +1030,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>second page</title> <subtitle>http://example.org/index.html</subtitle> <icon /> @@ -1152,7 +1152,7 @@ <pageId>3</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>second page</title> <subtitle>http://example.org/index.html</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_range.xml index 03d0e255fb..65b9fb2263 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_range.xml @@ -15,7 +15,7 @@ <pageId>1</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -135,7 +135,7 @@ <pageId>2</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index c97c185e95..428812aaef 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -13,7 +13,7 @@ <serverTimePretty>Mar 6, 2010 11:22:33</serverTimePretty> <pageId>1</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -41,7 +41,7 @@ <bandwidth /> <timeSpent>180</timeSpent> <timeSpentPretty>3 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index2.htm</subtitle> <icon /> @@ -58,7 +58,7 @@ <serverTimePretty>Mar 6, 2010 11:28:33</serverTimePretty> <pageId>3</pageId> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index3.htm</subtitle> <icon /> @@ -86,7 +86,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>no User Id set but it should appear in email@example.com!</title> <subtitle>http://example.org/no-user-id-set-but-should-appear-in-user-id-visit</subtitle> <icon /> @@ -105,7 +105,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>incredible title!</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -122,7 +122,7 @@ <serverTimePretty>Mar 6, 2010 13:28:33</serverTimePretty> <pageId>6</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>second page</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -148,7 +148,7 @@ <serverTimePretty>Mar 6, 2010 13:34:33</serverTimePretty> <pageId>7</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>a new user id was set -> new visit</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -176,7 +176,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>same user id was set -> this is the same unique user</title> <subtitle>http://example.org/home</subtitle> <icon /> @@ -193,7 +193,7 @@ <serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty> <pageId>9</pageId> <bandwidth /> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>second pageview - by this user id</title> <subtitle>http://example.org/home</subtitle> <icon /> @@ -221,7 +221,7 @@ <bandwidth /> <timeSpent>721</timeSpent> <timeSpentPretty>12 min 1s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>pageview - should not be tracked by our user id but in a new visit</title> <subtitle>http://example.org/home</subtitle> <icon /> @@ -286,7 +286,7 @@ <serverTimePretty>Mar 14, 2010 11:22:33</serverTimePretty> <pageId>11</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Page view by email@example.com</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> @@ -312,7 +312,7 @@ <serverTimePretty>Mar 14, 2010 11:46:33</serverTimePretty> <pageId>12</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>A page view by new-user-id@one-weeklater</title> <subtitle>http://example.org/index.htm</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml index f322baa549..3aa91520d2 100644 --- a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml @@ -40,7 +40,7 @@ <pageId>1</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>incredible �</title> <subtitle>http://example.org/foo/�.html</subtitle> <icon /> 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 da3d21a6ab..8db84fac40 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -113,7 +113,7 @@ <default_value /> </row> <row> - <column_name>interaction_position</column_name> + <column_name>pageview_position</column_name> <default_value /> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml b/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml index da3d21a6ab..8db84fac40 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__PrivacyManager.getAvailableLinkVisitActionColumnsToAnonymize.xml @@ -113,7 +113,7 @@ <default_value /> </row> <row> - <column_name>interaction_position</column_name> + <column_name>pageview_position</column_name> <default_value /> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 4ee8a5696e..4ec551d90a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -16,7 +16,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -152,7 +152,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -290,7 +290,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -324,7 +324,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Profile page</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> @@ -351,7 +351,7 @@ <pageId>3</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>Profile page for user *_)%</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 4ee8a5696e..4ec551d90a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -16,7 +16,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -152,7 +152,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -290,7 +290,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -324,7 +324,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Profile page</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> @@ -351,7 +351,7 @@ <pageId>3</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>Profile page for user *_)%</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 5061c289a2..6e0de642cc 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -40,7 +40,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -185,7 +185,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 4ee8a5696e..4ec551d90a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -16,7 +16,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -152,7 +152,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -290,7 +290,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -324,7 +324,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Profile page</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> @@ -351,7 +351,7 @@ <pageId>3</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>Profile page for user *_)%</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 4ee8a5696e..4ec551d90a 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -16,7 +16,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -152,7 +152,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -290,7 +290,7 @@ <bandwidth /> <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> @@ -324,7 +324,7 @@ <bandwidth /> <timeSpent>0</timeSpent> <timeSpentPretty>0s</timeSpentPretty> - <interactionPosition>2</interactionPosition> + <pageviewPosition>2</pageviewPosition> <title>Profile page</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> @@ -351,7 +351,7 @@ <pageId>3</pageId> <bandwidth /> - <interactionPosition>3</interactionPosition> + <pageviewPosition>3</pageviewPosition> <title>Profile page for user *_)%</title> <subtitle>http://example.org/user/profile</subtitle> <icon /> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 5061c289a2..6e0de642cc 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -40,7 +40,7 @@ <pageId>5</pageId> <bandwidth /> - <interactionPosition /> + <pageviewPosition /> <icon>plugins/Morpheus/images/link.png</icon> <iconSVG>plugins/Morpheus/images/link.svg</iconSVG> <title>Outlink</title> @@ -185,7 +185,7 @@ <pageId>4</pageId> <bandwidth /> - <interactionPosition>1</interactionPosition> + <pageviewPosition>1</pageviewPosition> <title>Homepage</title> <subtitle>http://example.org/homepage</subtitle> <icon /> diff --git a/tests/resources/OmniFixture-dump.sql b/tests/resources/OmniFixture-dump.sql index 0ff56ea11d..5f5baecbec 100644 --- a/tests/resources/OmniFixture-dump.sql +++ b/tests/resources/OmniFixture-dump.sql @@ -408,7 +408,7 @@ CREATE TABLE `log_link_visit_action` ( `custom_float` double DEFAULT NULL, `server_time` datetime NOT NULL, `idpageview` char(6) DEFAULT NULL, - `interaction_position` mediumint(8) unsigned DEFAULT NULL, + `pageview_position` mediumint(8) unsigned DEFAULT NULL, `idaction_name` int(10) unsigned DEFAULT NULL, `idaction_url` int(10) unsigned DEFAULT NULL, `search_cat` varchar(200) DEFAULT NULL, |