diff options
26 files changed, 58 insertions, 16 deletions
diff --git a/misc/log-analytics b/misc/log-analytics -Subproject 363a2c4cf3274a2f957a33c4a2f2bc0fb1435ce +Subproject a30c10280309ca03d9004d753faa431fc4bb36e diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml index 32434a44f6..209613d756 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml @@ -14,4 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml index 527a5d7177..6cc283b555 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml @@ -26,4 +26,17 @@ <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result> + <result idSite="3"> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_users>0</nb_users> + <nb_visits>3</nb_visits> + <nb_actions>5</nb_actions> + <nb_visits_converted>0</nb_visits_converted> + <bounce_count>2</bounce_count> + <sum_visit_length>1</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>67%</bounce_rate> + <nb_actions_per_visit>1.7</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> + </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml index b83a03206f..16c4dae84f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml @@ -14,4 +14,5 @@ <avg_time_on_site>12</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml index 46ff0006a8..19948ee71e 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml @@ -22,4 +22,15 @@ <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>0</avg_time_on_site> </result> + <result idSite="3"> + <nb_visits>3</nb_visits> + <nb_actions>5</nb_actions> + <nb_visits_converted>0</nb_visits_converted> + <bounce_count>2</bounce_count> + <sum_visit_length>1</sum_visit_length> + <max_actions>3</max_actions> + <bounce_rate>67%</bounce_rate> + <nb_actions_per_visit>1.7</nb_actions_per_visit> + <avg_time_on_site>0</avg_time_on_site> + </result> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 84daa26e4f..9cade6e155 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -2,7 +2,7 @@ <result> <row> <idSite>1</idSite> - <idVisit>41</idVisit> + <idVisit>56</idVisit> <visitIp>175.41.192.40</visitIp> <actionDetails> @@ -12,7 +12,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>48</pageId> + <pageId>69</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -30,7 +30,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>48</goalPageId> + <goalPageId>69</goalPageId> <url>http://piwik.net/blog/category/meta/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -42,7 +42,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>52</pageId> + <pageId>73</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -61,7 +61,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>56</pageId> + <pageId>77</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -80,7 +80,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>49</pageId> + <pageId>70</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -99,7 +99,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>53</pageId> + <pageId>74</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -118,7 +118,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>57</pageId> + <pageId>78</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -137,7 +137,7 @@ <pageTitle /> <pageIdAction>3</pageIdAction> - <pageId>50</pageId> + <pageId>71</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -156,7 +156,7 @@ <pageTitle /> <pageIdAction>3</pageIdAction> - <pageId>54</pageId> + <pageId>75</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -175,7 +175,7 @@ <pageTitle /> <pageIdAction>4</pageIdAction> - <pageId>51</pageId> + <pageId>72</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -194,7 +194,7 @@ <pageTitle /> <pageIdAction>4</pageIdAction> - <pageId>55</pageId> + <pageId>76</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml index 1c7f2179e5..dd52dc4ff4 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml @@ -2,4 +2,5 @@ <results> <result idSite="1" /> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml index 4131d7b225..2f05440fac 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml @@ -14,5 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> - <result idSite="3" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml index f6a5789010..69cfb8ea52 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml @@ -14,5 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> - <result idSite="3" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml index 6352330b73..3b8ee5ce75 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml @@ -14,5 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> - <result idSite="3" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml index df94d8337d..127cfeba90 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml @@ -12,5 +12,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> - <result idSite="3" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml index 32434a44f6..209613d756 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml @@ -14,4 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml index 0f88508621..22528b0939 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml @@ -14,4 +14,5 @@ <avg_time_on_site>12</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml index b83a03206f..16c4dae84f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml @@ -14,4 +14,5 @@ <avg_time_on_site>12</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml index c89ec107ec..e0409a2e7a 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml @@ -12,4 +12,5 @@ <avg_time_on_site>13</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml index 32434a44f6..209613d756 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml @@ -14,4 +14,5 @@ <avg_time_on_site>0</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml index 0f88508621..22528b0939 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml @@ -14,4 +14,5 @@ <avg_time_on_site>12</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml index b83a03206f..16c4dae84f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml @@ -14,4 +14,5 @@ <avg_time_on_site>12</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml index c89ec107ec..e0409a2e7a 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml @@ -12,4 +12,5 @@ <avg_time_on_site>13</avg_time_on_site> </result> <result idSite="2" /> + <result idSite="3" /> </results>
\ No newline at end of file |