diff options
| author | diosmosis <benaka@piwik.pro> | 2015-12-10 06:57:04 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-12-10 06:57:04 +0300 |
| commit | 771ae1342fef9454025d1aaa19569d8094bc34a8 (patch) | |
| tree | cb6be6001d273adcdba5f9404135e67de7843c5c | |
| parent | 4ff48661dcf6ddc67651bcd800bd63227e1d5579 (diff) | |
Add ipv6 to IIS log file in ImportLogsTest to make sure it works properly.
60 files changed, 736 insertions, 545 deletions
diff --git a/misc/log-analytics b/misc/log-analytics -Subproject aa600c9a20049db05443c1ebd69f68190870247 +Subproject 8293993203b7a1c98a2f6344e6e7fbb0cfde9e6 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 10b6cbd275..2bb1a15667 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>blog</label> - <nb_visits>5</nb_visits> - <nb_hits>5</nb_hits> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>5</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>5</entry_bounce_count> - <exit_nb_visits>5</exit_nb_visits> + <entry_bounce_count>6</entry_bounce_count> + <exit_nb_visits>6</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> @@ -20,45 +20,45 @@ <subtable> <row> <label>category</label> - <nb_visits>4</nb_visits> - <nb_hits>4</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>meta</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>/index</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 136c7cf125..d1c53283d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -2,77 +2,77 @@ <result> <row> <label>blog</label> - <nb_visits>9</nb_visits> - <nb_hits>12</nb_hits> + <nb_visits>10</nb_visits> + <nb_hits>13</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>7</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>8</entry_nb_visits> - <entry_nb_actions>17</entry_nb_actions> + <entry_nb_visits>9</entry_nb_visits> + <entry_nb_actions>18</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>7</entry_bounce_count> - <exit_nb_visits>7</exit_nb_visits> - <avg_time_on_page>18</avg_time_on_page> - <bounce_rate>88%</bounce_rate> - <exit_rate>78%</exit_rate> + <entry_bounce_count>8</entry_bounce_count> + <exit_nb_visits>8</exit_nb_visits> + <avg_time_on_page>17</avg_time_on_page> + <bounce_rate>89%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> <subtable> <row> <label>category</label> - <nb_visits>6</nb_visits> - <nb_hits>9</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>10</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>5</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>14</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>15</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>28</avg_time_on_page> - <bounce_rate>80%</bounce_rate> - <exit_rate>67%</exit_rate> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <avg_time_on_page>24</avg_time_on_page> + <bounce_rate>83%</bounce_rate> + <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> <subtable> <row> <label>meta</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <subtable> <row> <label>/index</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <url>http://piwik.net/blog/category/meta/</url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 89abc41b11..05350333b8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>blog</label> - <nb_visits>5</nb_visits> - <nb_hits>5</nb_hits> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>5</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>5</entry_bounce_count> - <exit_nb_visits>5</exit_nb_visits> + <entry_bounce_count>6</entry_bounce_count> + <exit_nb_visits>6</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> @@ -20,45 +20,45 @@ <subtable> <row> <label>category</label> - <nb_visits>4</nb_visits> - <nb_hits>4</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>meta</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>/index</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index acc61f1910..e5240da081 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -2,77 +2,77 @@ <result> <row> <label>blog</label> - <nb_visits>9</nb_visits> - <nb_hits>12</nb_hits> + <nb_visits>10</nb_visits> + <nb_hits>13</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>7</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>8</entry_nb_visits> - <entry_nb_actions>17</entry_nb_actions> + <entry_nb_visits>9</entry_nb_visits> + <entry_nb_actions>18</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>7</entry_bounce_count> - <exit_nb_visits>7</exit_nb_visits> - <avg_time_on_page>18</avg_time_on_page> - <bounce_rate>88%</bounce_rate> - <exit_rate>78%</exit_rate> + <entry_bounce_count>8</entry_bounce_count> + <exit_nb_visits>8</exit_nb_visits> + <avg_time_on_page>17</avg_time_on_page> + <bounce_rate>89%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> <subtable> <row> <label>category</label> - <nb_visits>6</nb_visits> - <nb_hits>9</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>10</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>5</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>14</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>15</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>28</avg_time_on_page> - <bounce_rate>80%</bounce_rate> - <exit_rate>67%</exit_rate> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <avg_time_on_page>24</avg_time_on_page> + <bounce_rate>83%</bounce_rate> + <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> <subtable> <row> <label>meta</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <subtable> <row> <label>/index</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <url>http://piwik.net/blog/category/meta/</url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 1506b1f2d3..a56dd22637 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>26</nb_visits> - <nb_hits>27</nb_hits> + <nb_visits>27</nb_visits> + <nb_hits>28</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> <min_time_generation>0.001</min_time_generation> <max_time_generation>0.359</max_time_generation> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 56591ed8ab..9ac6ea68c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,13 +2,13 @@ <result> <row> <label>Page Name not defined</label> - <nb_visits>27</nb_visits> - <nb_hits>37</nb_hits> + <nb_visits>28</nb_visits> + <nb_hits>38</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>16</nb_hits_with_time_generation> <min_time_generation>0.001</min_time_generation> <max_time_generation>1.324</max_time_generation> - <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>0%</exit_rate> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 8b4c3e8f59..cf6cb6491a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -2,17 +2,17 @@ <result> <row> <label>blog</label> - <nb_visits>5</nb_visits> - <nb_hits>5</nb_hits> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>0</nb_hits_with_time_generation> <min_time_generation /> <max_time_generation>0</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>5</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>5</entry_bounce_count> - <exit_nb_visits>5</exit_nb_visits> + <entry_bounce_count>6</entry_bounce_count> + <exit_nb_visits>6</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> @@ -20,45 +20,45 @@ <subtable> <row> <label>category</label> - <nb_visits>4</nb_visits> - <nb_hits>4</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>5</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>4</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>5</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>meta</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> <subtable> <row> <label>/index</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> <sum_time_spent>0</sum_time_spent> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_visits>4</entry_nb_visits> + <entry_nb_actions>4</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>3</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index b39b3cb13f..6cad9e0d80 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -2,77 +2,77 @@ <result> <row> <label>blog</label> - <nb_visits>9</nb_visits> - <nb_hits>12</nb_hits> + <nb_visits>10</nb_visits> + <nb_hits>13</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>7</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>8</entry_nb_visits> - <entry_nb_actions>17</entry_nb_actions> + <entry_nb_visits>9</entry_nb_visits> + <entry_nb_actions>18</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>7</entry_bounce_count> - <exit_nb_visits>7</exit_nb_visits> - <avg_time_on_page>18</avg_time_on_page> - <bounce_rate>88%</bounce_rate> - <exit_rate>78%</exit_rate> + <entry_bounce_count>8</entry_bounce_count> + <exit_nb_visits>8</exit_nb_visits> + <avg_time_on_page>17</avg_time_on_page> + <bounce_rate>89%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.389</avg_time_generation> <subtable> <row> <label>category</label> - <nb_visits>6</nb_visits> - <nb_hits>9</nb_hits> + <nb_visits>7</nb_visits> + <nb_hits>10</nb_hits> <sum_time_spent>166</sum_time_spent> <nb_hits_with_time_generation>5</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>1.324</max_time_generation> - <entry_nb_visits>5</entry_nb_visits> - <entry_nb_actions>14</entry_nb_actions> + <entry_nb_visits>6</entry_nb_visits> + <entry_nb_actions>15</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>4</entry_bounce_count> - <exit_nb_visits>4</exit_nb_visits> - <avg_time_on_page>28</avg_time_on_page> - <bounce_rate>80%</bounce_rate> - <exit_rate>67%</exit_rate> + <entry_bounce_count>5</entry_bounce_count> + <exit_nb_visits>5</exit_nb_visits> + <avg_time_on_page>24</avg_time_on_page> + <bounce_rate>83%</bounce_rate> + <exit_rate>71%</exit_rate> <avg_time_generation>0.443</avg_time_generation> <subtable> <row> <label>meta</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <subtable> <row> <label>/index</label> - <nb_visits>4</nb_visits> - <nb_hits>6</nb_hits> + <nb_visits>5</nb_visits> + <nb_hits>7</nb_hits> <sum_time_spent>151</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.023</min_time_generation> <max_time_generation>0.123</max_time_generation> - <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>13</entry_nb_actions> + <entry_nb_visits>5</entry_nb_visits> + <entry_nb_actions>14</entry_nb_actions> <entry_sum_visit_length>54</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>38</avg_time_on_page> - <bounce_rate>75%</bounce_rate> - <exit_rate>75%</exit_rate> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>30</avg_time_on_page> + <bounce_rate>80%</bounce_rate> + <exit_rate>80%</exit_rate> <avg_time_generation>0.089</avg_time_generation> <url>http://piwik.net/blog/category/meta/</url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index 13b24ecfac..a9f37fee84 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>38</nb_pageviews> - <nb_uniq_pageviews>37</nb_uniq_pageviews> + <nb_pageviews>39</nb_pageviews> + <nb_uniq_pageviews>38</nb_uniq_pageviews> <nb_downloads>4</nb_downloads> <nb_uniq_downloads>4</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index 80680b1482..f06074a2b3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_pageviews>62</nb_pageviews> - <nb_uniq_pageviews>55</nb_uniq_pageviews> + <nb_pageviews>63</nb_pageviews> + <nb_uniq_pageviews>56</nb_uniq_pageviews> <nb_downloads>5</nb_downloads> <nb_uniq_downloads>5</nb_uniq_downloads> <nb_outlinks>1</nb_outlinks> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 4582327ecc..3746937e85 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>HTTP-code</label> - <nb_actions>43</nb_actions> + <nb_actions>44</nb_actions> <slots> <row> <scope>page</scope> @@ -17,9 +17,9 @@ <subtable> <row> <label>200</label> - <nb_visits>32</nb_visits> - <nb_actions>34</nb_actions> - <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> + <nb_visits>33</nb_visits> + <nb_actions>35</nb_actions> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> </row> <row> <label>301</label> @@ -55,21 +55,21 @@ </row> <row> <label>Not-Bot</label> - <nb_visits>7</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>5</bounce_count> + <bounce_count>6</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>5</nb_conversions> - <nb_visits_converted>5</nb_visits_converted> - <revenue>25</revenue> + <nb_conversions>6</nb_conversions> + <nb_visits_converted>6</nb_visits_converted> + <revenue>30</revenue> </row> </goals> - <nb_conversions>5</nb_conversions> - <revenue>25</revenue> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <nb_conversions>6</nb_conversions> + <revenue>30</revenue> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <slots> <row> @@ -81,21 +81,21 @@ <subtable> <row> <label>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</label> - <nb_visits>4</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>8</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>3</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>3</nb_conversions> - <nb_visits_converted>3</nb_visits_converted> - <revenue>15</revenue> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> </row> </goals> - <nb_conversions>3</nb_conversions> - <revenue>15</revenue> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <nb_conversions>4</nb_conversions> + <revenue>20</revenue> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml index 4e74cbbfdf..55ef69079d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml @@ -11,8 +11,8 @@ </row> <row> <name>Not-Bot</name> - <nb_visits>7</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>11</nb_actions> </row> <row> <name>User Name</name> @@ -72,7 +72,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>69</nb_actions> + <nb_actions>70</nb_actions> </row> <row> <name>Generation Time</name> @@ -99,7 +99,7 @@ <row> <name>HTTP-code</name> <nb_visits>0</nb_visits> - <nb_actions>69</nb_actions> + <nb_actions>70</nb_actions> </row> </usages> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml index b3aef9f3d3..e2ab7a0e53 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml @@ -3,19 +3,19 @@ <row> <label>Cookie</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>7%</nb_visits_percentage> + <nb_visits_percentage>6%</nb_visits_percentage> <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>7%</nb_visits_percentage> + <nb_visits_percentage>6%</nb_visits_percentage> <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>7%</nb_visits_percentage> + <nb_visits_percentage>6%</nb_visits_percentage> <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 48593c4304..08840cc821 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>30</nb_visits_converted> - <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>31</nb_visits_converted> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index fc9865b725..4c4cb49892 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>WebKit (Safari, Chrome)</label> - <nb_visits>17</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>18</nb_visits> + <nb_actions>21</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>15</bounce_count> - <nb_visits_converted>16</nb_visits_converted> - <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> + <bounce_count>16</bounce_count> + <nb_visits_converted>17</nb_visits_converted> + <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserEngine==WebKit</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 971cd5f0fb..d1231b5bb1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -25,6 +25,18 @@ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> + <label>RockMelt</label> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -37,18 +49,6 @@ <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> - <label>RockMelt</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - </row> - <row> <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index d6572a8ba3..8d82c019fc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -1,6 +1,19 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>RockMelt 0.9</label> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>browserCode==RM;browserVersion==0.9</segment> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + </row> + <row> <label>Epiphany 2.30</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -27,19 +40,6 @@ <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> - <label>RockMelt 0.9</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <segment>browserCode==RM;browserVersion==0.9</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - </row> - <row> <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 6f39904036..34e9fb7630 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -27,6 +27,19 @@ <segment>browserCode==IE</segment> </row> <row> + <label>RockMelt</label> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <segment>browserCode==RM</segment> + </row> + <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -40,19 +53,6 @@ <segment>browserCode==EP</segment> </row> <row> - <label>RockMelt</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> - <segment>browserCode==RM</segment> - </row> - <row> <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index ab2a9c029e..f330ccb30f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>34</nb_visits> - <nb_actions>39</nb_actions> + <nb_visits>35</nb_visits> + <nb_actions>40</nb_actions> <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>30</nb_visits_converted> - <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>31</nb_visits_converted> + <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 813ebfe05a..c7234f8606 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Mac</label> - <nb_visits>11</nb_visits> - <nb_actions>15</nb_actions> + <nb_visits>12</nb_visits> + <nb_actions>16</nb_actions> <max_actions>3</max_actions> <sum_visit_length>307</sum_visit_length> - <bounce_count>8</bounce_count> - <nb_visits_converted>10</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <bounce_count>9</bounce_count> + <nb_visits_converted>11</nb_visits_converted> + <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 38dd7759a4..8ff1d6faee 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -28,13 +28,13 @@ </row> <row> <label>Mac 10.6</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index af1de4ce8e..875400f578 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>30</nb_visits> - <nb_actions>35</nb_actions> + <nb_visits>31</nb_visits> + <nb_actions>36</nb_actions> <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> - <bounce_count>26</bounce_count> - <nb_visits_converted>29</nb_visits_converted> - <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors> + <bounce_count>27</bounce_count> + <nb_visits_converted>30</nb_visits_converted> + <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index e8f75dee69..d6f76b939e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0 days</label> - <nb_conversions>32</nb_conversions> + <nb_conversions>33</nb_conversions> </row> <row> <label>1 day</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml index 7ada36be0d..d97c3eb0d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>33</nb_conversions> - <nb_visits_converted>33</nb_visits_converted> - <revenue>165</revenue> - <conversion_rate>89.19%</conversion_rate> + <nb_conversions>34</nb_conversions> + <nb_visits_converted>34</nb_visits_converted> + <revenue>170</revenue> + <conversion_rate>89.47%</conversion_rate> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index f906c7ccaf..fcd1e7c56b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_conversions>33</nb_conversions> + <nb_conversions>34</nb_conversions> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml index 13474931ed..73154bb53f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_conversions>33</nb_conversions> - <nb_visits_converted>33</nb_visits_converted> - <revenue>165</revenue> - <conversion_rate>89.19%</conversion_rate> - <nb_conversions_new_visit>30</nb_conversions_new_visit> - <nb_visits_converted_new_visit>30</nb_visits_converted_new_visit> - <revenue_new_visit>150</revenue_new_visit> - <conversion_rate_new_visit>88.24%</conversion_rate_new_visit> + <nb_conversions>34</nb_conversions> + <nb_visits_converted>34</nb_visits_converted> + <revenue>170</revenue> + <conversion_rate>89.47%</conversion_rate> + <nb_conversions_new_visit>31</nb_conversions_new_visit> + <nb_visits_converted_new_visit>31</nb_visits_converted_new_visit> + <revenue_new_visit>155</revenue_new_visit> + <conversion_rate_new_visit>88.57%</conversion_rate_new_visit> <nb_conversions_returning_visit>3</nb_conversions_returning_visit> <nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit> <revenue_returning_visit>15</revenue_returning_visit> 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 facf6114ed..84ba4e506d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -2,7 +2,7 @@ <result> <row> <idSite>1</idSite> - <idVisit>41</idVisit> + <idVisit>42</idVisit> <visitIp>174.97.139.63</visitIp> <actionDetails> @@ -11,7 +11,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>48</goalPageId> + <goalPageId>49</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -23,7 +23,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>48</pageId> + <pageId>49</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -128,7 +128,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>34</idVisit> + <idVisit>35</idVisit> <visitIp>206.190.75.8</visitIp> <actionDetails> @@ -138,7 +138,7 @@ <pageTitle>Changelog Archive - Analytics - Piwik</pageTitle> <pageIdAction>44</pageIdAction> - <pageId>39</pageId> + <pageId>40</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -155,7 +155,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>39</goalPageId> + <goalPageId>40</goalPageId> <url>http://piwik.org/changelog/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -167,7 +167,7 @@ <pageTitle>Contact the Piwik team - Analytics - Piwik</pageTitle> <pageIdAction>55</pageIdAction> - <pageId>47</pageId> + <pageId>48</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -258,7 +258,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>40</idVisit> + <idVisit>41</idVisit> <visitIp>193.159.20.129</visitIp> <actionDetails> @@ -267,7 +267,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>46</goalPageId> + <goalPageId>47</goalPageId> <url>http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -279,7 +279,7 @@ <pageTitle>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</pageTitle> <pageIdAction>53</pageIdAction> - <pageId>46</pageId> + <pageId>47</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -396,7 +396,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>38</idVisit> + <idVisit>39</idVisit> <visitIp>50.244.17.130</visitIp> <actionDetails> @@ -406,7 +406,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>43</pageId> + <pageId>44</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -423,7 +423,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>43</goalPageId> + <goalPageId>44</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -435,7 +435,7 @@ <pageTitle>What is Piwik? - Analytics - Piwik</pageTitle> <pageIdAction>51</pageIdAction> - <pageId>45</pageId> + <pageId>46</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -543,7 +543,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>39</idVisit> + <idVisit>40</idVisit> <visitIp>84.194.72.21</visitIp> <actionDetails> @@ -553,7 +553,7 @@ <pageTitle /> <pageIdAction>49</pageIdAction> - <pageId>44</pageId> + <pageId>45</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -661,7 +661,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>37</idVisit> + <idVisit>38</idVisit> <visitIp>108.211.181.12</visitIp> <actionDetails> @@ -670,7 +670,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>42</goalPageId> + <goalPageId>43</goalPageId> <url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -682,7 +682,7 @@ <pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle> <pageIdAction>48</pageIdAction> - <pageId>42</pageId> + <pageId>43</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -799,7 +799,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>36</idVisit> + <idVisit>37</idVisit> <visitIp>219.101.46.222</visitIp> <actionDetails> @@ -808,7 +808,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>41</goalPageId> + <goalPageId>42</goalPageId> <url>https://piwik.org/log-analytics/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -820,7 +820,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>42</pageIdAction> - <pageId>41</pageId> + <pageId>42</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -924,7 +924,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>35</idVisit> + <idVisit>36</idVisit> <visitIp>80.136.160.65</visitIp> <actionDetails> @@ -933,7 +933,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>40</goalPageId> + <goalPageId>41</goalPageId> <url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -945,7 +945,7 @@ <pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle> <pageIdAction>46</pageIdAction> - <pageId>40</pageId> + <pageId>41</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1042,7 +1042,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>33</idVisit> + <idVisit>34</idVisit> <visitIp>188.107.238.9</visitIp> <actionDetails> @@ -1051,7 +1051,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>38</goalPageId> + <goalPageId>39</goalPageId> <url>http://piwik.org/log-analytics/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1063,7 +1063,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>42</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1180,7 +1180,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>31</idVisit> + <idVisit>32</idVisit> <visitIp>93.80.130.163</visitIp> <actionDetails> @@ -1190,7 +1190,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1208,7 +1208,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>34</goalPageId> + <goalPageId>35</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1220,7 +1220,7 @@ <pageTitle>Download - Analytics - Piwik</pageTitle> <pageIdAction>39</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1239,7 +1239,7 @@ <pageTitle /> <pageIdAction>40</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1339,7 +1339,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>32</idVisit> + <idVisit>33</idVisit> <visitIp>176.41.226.154</visitIp> <actionDetails> @@ -1348,7 +1348,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>35</goalPageId> + <goalPageId>36</goalPageId> <url>http://piwik.org/docs/installation/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1360,7 +1360,7 @@ <pageTitle>Hello Installing Piwik - Analytics - Piwik</pageTitle> <pageIdAction>37</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1469,7 +1469,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>30</idVisit> + <idVisit>31</idVisit> <visitIp>84.194.72.21</visitIp> <actionDetails> @@ -1478,7 +1478,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>33</goalPageId> + <goalPageId>34</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1490,7 +1490,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1599,7 +1599,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>56</idVisit> + <idVisit>57</idVisit> <visitIp>175.41.192.40</visitIp> <actionDetails> @@ -1609,7 +1609,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>69</pageId> + <pageId>70</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1627,7 +1627,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>69</goalPageId> + <goalPageId>70</goalPageId> <url>http://piwik.net/blog/category/meta/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1639,7 +1639,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>73</pageId> + <pageId>74</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1658,7 +1658,7 @@ <pageTitle /> <pageIdAction>1</pageIdAction> - <pageId>77</pageId> + <pageId>78</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1677,7 +1677,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>70</pageId> + <pageId>71</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1696,7 +1696,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>74</pageId> + <pageId>75</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1715,7 +1715,7 @@ <pageTitle /> <pageIdAction>2</pageIdAction> - <pageId>78</pageId> + <pageId>79</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1734,7 +1734,7 @@ <pageTitle /> <pageIdAction>3</pageIdAction> - <pageId>71</pageId> + <pageId>72</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1753,7 +1753,7 @@ <pageTitle /> <pageIdAction>3</pageIdAction> - <pageId>75</pageId> + <pageId>76</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1772,7 +1772,7 @@ <pageTitle /> <pageIdAction>4</pageIdAction> - <pageId>72</pageId> + <pageId>73</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1791,7 +1791,7 @@ <pageTitle /> <pageIdAction>4</pageIdAction> - <pageId>76</pageId> + <pageId>77</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1879,7 +1879,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>61</idVisit> + <idVisit>62</idVisit> <visitIp>192.0.2.10</visitIp> <actionDetails> @@ -1888,7 +1888,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>85</goalPageId> + <goalPageId>86</goalPageId> <url>http://piwik.net/view/my/file.html</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -1900,7 +1900,7 @@ <pageTitle /> <pageIdAction>65</pageIdAction> - <pageId>85</pageId> + <pageId>86</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1988,7 +1988,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>60</idVisit> + <idVisit>61</idVisit> <visitIp>172.20.1.0</visitIp> <actionDetails> @@ -1998,7 +1998,7 @@ <pageTitle>302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp</pageTitle> <pageIdAction>63</pageIdAction> - <pageId>83</pageId> + <pageId>84</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2015,7 +2015,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>83</goalPageId> + <goalPageId>84</goalPageId> <url>http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2027,7 +2027,7 @@ <pageTitle /> <pageIdAction>64</pageIdAction> - <pageId>84</pageId> + <pageId>85</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2114,7 +2114,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>66</idVisit> + <idVisit>67</idVisit> <visitIp>173.5.0.0</visitIp> <actionDetails> @@ -2123,7 +2123,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>92</goalPageId> + <goalPageId>93</goalPageId> <url>http://hello.example.com/hello/from/another/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2135,7 +2135,7 @@ <pageTitle /> <pageIdAction>61</pageIdAction> - <pageId>92</pageId> + <pageId>93</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2235,7 +2235,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>57</idVisit> + <idVisit>58</idVisit> <visitIp>70.95.0.0</visitIp> <actionDetails> @@ -2245,7 +2245,7 @@ <pageTitle /> <pageIdAction>56</pageIdAction> - <pageId>79</pageId> + <pageId>80</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2263,7 +2263,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>79</goalPageId> + <goalPageId>80</goalPageId> <url>http://xzy.example.com/Products/theProduct</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2275,7 +2275,7 @@ <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> <pageIdAction>58</pageIdAction> - <pageId>80</pageId> + <pageId>81</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2293,7 +2293,7 @@ <pageTitle /> <pageIdAction>56</pageIdAction> - <pageId>89</pageId> + <pageId>90</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2393,7 +2393,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>58</idVisit> + <idVisit>59</idVisit> <visitIp>173.5.0.0</visitIp> <actionDetails> @@ -2402,7 +2402,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>81</goalPageId> + <goalPageId>82</goalPageId> <url>http://hello.example.com/hello/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2414,7 +2414,7 @@ <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> <pageIdAction>60</pageIdAction> - <pageId>81</pageId> + <pageId>82</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2502,7 +2502,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>59</idVisit> + <idVisit>60</idVisit> <visitIp>173.5.0.0</visitIp> <actionDetails> @@ -2512,7 +2512,7 @@ <pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle> <pageIdAction>60</pageIdAction> - <pageId>91</pageId> + <pageId>92</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2538,7 +2538,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>82</goalPageId> + <goalPageId>83</goalPageId> <url>http://hello.example.com/hello/from/another/world/6,681965</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2550,7 +2550,7 @@ <pageTitle /> <pageIdAction>61</pageIdAction> - <pageId>82</pageId> + <pageId>83</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -2638,7 +2638,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>65</idVisit> + <idVisit>66</idVisit> <visitIp>70.95.32.0</visitIp> <actionDetails> @@ -2647,7 +2647,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>90</goalPageId> + <goalPageId>91</goalPageId> <url>http://example.hello.com/Topic/hw43061</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2659,7 +2659,7 @@ <pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle> <pageIdAction>58</pageIdAction> - <pageId>90</pageId> + <pageId>91</pageId> <customVariables> <row> <customVariablePageName1>Generation Time</customVariablePageName1> @@ -2758,7 +2758,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>26</idVisit> + <idVisit>27</idVisit> <visitIp>0.0.0.0</visitIp> <actionDetails> @@ -2767,7 +2767,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>29</goalPageId> + <goalPageId>30</goalPageId> <url>http://example.org/index.htm</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2779,7 +2779,7 @@ <pageTitle>incredible title!</pageTitle> <pageIdAction>29</pageIdAction> - <pageId>29</pageId> + <pageId>30</pageId> <customVariables> <row> <customVariablePageName3>_pks</customVariablePageName3> @@ -2887,7 +2887,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>27</idVisit> + <idVisit>28</idVisit> <visitIp>0.0.0.0</visitIp> <actionDetails> @@ -2896,7 +2896,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>30</goalPageId> + <goalPageId>31</goalPageId> <url>http://forum.piwik.org/register.php?0,approve=9a94a02145599</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -2908,7 +2908,7 @@ <pageTitle>Piwik Forums</pageTitle> <pageIdAction>31</pageIdAction> - <pageId>30</pageId> + <pageId>31</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -3024,7 +3024,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>64</idVisit> + <idVisit>65</idVisit> <visitIp>72.45.67.32</visitIp> <actionDetails> @@ -3033,7 +3033,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>88</goalPageId> + <goalPageId>89</goalPageId> <url>http://piwik.net/</url> <icon>plugins/Morpheus/images/goal.png</icon> @@ -3045,7 +3045,7 @@ <pageTitle /> <pageIdAction>5</pageIdAction> - <pageId>88</pageId> + <pageId>89</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -3133,7 +3133,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>63</idVisit> + <idVisit>64</idVisit> <visitIp>192.0.2.222</visitIp> <actionDetails> @@ -3142,7 +3142,7 @@ <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?key=value</url> <pageIdAction>66</pageIdAction> - <pageId>87</pageId> + <pageId>88</pageId> <eventCategory>cloudfront_rtmp</eventCategory> <eventAction>play</eventAction> <customVariables> @@ -3232,7 +3232,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>62</idVisit> + <idVisit>63</idVisit> <visitIp>192.0.2.147</visitIp> <actionDetails> @@ -3241,7 +3241,7 @@ <url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?key=value</url> <pageIdAction>66</pageIdAction> - <pageId>86</pageId> + <pageId>87</pageId> <eventCategory>cloudfront_rtmp</eventCategory> <eventAction>connect</eventAction> <customVariables> @@ -3442,6 +3442,118 @@ </row> <row> <idSite>1</idSite> + <idVisit>26</idVisit> + <visitIp>::ffff:123.45.67.89</visitIp> + + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.png</icon> + + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + <pageId>29</pageId> + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <icon /> + + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.gif</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel /> + <operatingSystem>Mac 10.6</operatingSystem> + <operatingSystemName>Mac</operatingSystemName> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemCode>MAC</operatingSystemCode> + <operatingSystemVersion>10.6</operatingSystemVersion> + <browserFamily>WebKit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browser>RockMelt 0.9</browser> + <browserName>RockMelt</browserName> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserCode>RM</browserCode> + <browserVersion>0.9</browserVersion> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>South Korea</country> + <countryCode>kr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/kr.png</countryFlag> + <region>Seoul-t'ukpyolsi</region> + <regionCode>11</regionCode> + <city>Seoul</city> + <location>Seoul, Seoul-t'ukpyolsi, South Korea</location> + <latitude>37.598999</latitude> + <longitude>126.977997</longitude> + <visitLocalTime>20:15:41</visitLocalTime> + <visitLocalHour>20</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + <row> + <customVariableName1>Not-Bot</customVariableName1> + <customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1> + </row> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>24</idVisit> <visitIp>175.41.192.43</visitIp> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index 071b803478..8485ac465c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ <result> <row> <label>Piwik test</label> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> - <nb_pageviews>38</nb_pageviews> - <revenue>165</revenue> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> + <nb_pageviews>39</nb_pageviews> + <revenue>170</revenue> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index 79c9ff4ab6..9b9cc1efd7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> - <nb_pageviews>38</nb_pageviews> - <revenue>165</revenue> + <nb_pageviews>39</nb_pageviews> + <revenue>170</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index b0ecf5b676..a1e8fd0e9d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Direct Entry</label> - <nb_visits>33</nb_visits> - <nb_actions>38</nb_actions> + <nb_visits>34</nb_visits> + <nb_actions>39</nb_actions> <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> - <bounce_count>29</bounce_count> + <bounce_count>30</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>29</nb_conversions> - <nb_visits_converted>29</nb_visits_converted> - <revenue>145</revenue> + <nb_conversions>30</nb_conversions> + <nb_visits_converted>30</nb_visits_converted> + <revenue>150</revenue> </row> </goals> - <nb_conversions>29</nb_conversions> - <revenue>145</revenue> - <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors> + <nb_conversions>30</nb_conversions> + <revenue>150</revenue> + <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml index 110eafe235..55471df8f7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Mac / RockMelt / unknown</label> + <nb_visits>6</nb_visits> + <nb_actions>9</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>305</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>Windows / Internet Explorer / unknown</label> <nb_visits>6</nb_visits> <nb_actions>7</nb_actions> @@ -34,17 +45,6 @@ <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> - <label>Mac / RockMelt / unknown</label> - <nb_visits>5</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - </row> - <row> <label>Unknown / Unknown / unknown</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index 6adc37a0cd..2dd3a3f0ff 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>unknown</label> - <nb_visits>35</nb_visits> - <nb_actions>42</nb_actions> + <nb_visits>36</nb_visits> + <nb_actions>43</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>30</bounce_count> - <nb_visits_converted>31</nb_visits_converted> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <bounce_count>31</bounce_count> + <nb_visits_converted>32</nb_visits_converted> + <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <segment>resolution==unknown</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index d91f34ccc0..fa5433509b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -83,4 +83,32 @@ <region_name>Nunavut</region_name> <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> + <row> + <label>Seoul, Seoul-t&#039;ukpyolsi, South Korea</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <lat>37.599</lat> + <long>126.978</long> + <segment>city==Seoul;regionCode==11;countryCode==kr</segment> + <city_name>Seoul</city_name> + <region>11</region> + <country>kr</country> + <country_name>South Korea</country_name> + <region_name>Seoul-t'ukpyolsi</region_name> + <logo>plugins/UserCountry/images/flags/kr.png</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 14bb86a968..054cf2e1d3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -2,21 +2,21 @@ <result> <row> <label>Asia</label> - <nb_visits>11</nb_visits> - <nb_actions>14</nb_actions> + <nb_visits>12</nb_visits> + <nb_actions>15</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>9</bounce_count> + <bounce_count>10</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>10</nb_conversions> - <nb_visits_converted>10</nb_visits_converted> - <revenue>50</revenue> + <nb_conversions>11</nb_conversions> + <nb_visits_converted>11</nb_visits_converted> + <revenue>55</revenue> </row> </goals> - <nb_conversions>10</nb_conversions> - <revenue>50</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <nb_conversions>11</nb_conversions> + <revenue>55</revenue> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>Asia</code> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 2faa0742a5..98deda9945 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -137,4 +137,28 @@ <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> + <row> + <label>South Korea</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <code>kr</code> + <logo>plugins/UserCountry/images/flags/kr.png</logo> + <segment>countryCode==kr</segment> + <logoWidth>16</logoWidth> + <logoHeight>11</logoHeight> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml index 3cc2819f51..773871bab0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>6</result>
\ No newline at end of file +<result>7</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 5631e75efb..bdcfaeca3c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -75,4 +75,29 @@ <region_name>Nunavut</region_name> <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> + <row> + <label>Seoul-t&#039;ukpyolsi, South Korea</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + <segment>regionCode==11;countryCode==kr</segment> + <region>11</region> + <country>kr</country> + <country_name>South Korea</country_name> + <region_name>Seoul-t'ukpyolsi</region_name> + <logo>plugins/UserCountry/images/flags/kr.png</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml index 9e03cf2c7f..da22c13a83 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown (xx)</label> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>32</bounce_count> - <nb_visits_converted>33</nb_visits_converted> - <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors> + <bounce_count>33</bounce_count> + <nb_visits_converted>34</nb_visits_converted> + <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <segment>languageCode==xx</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml index a1cb640be4..d2c34aab1a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> <max_actions>3</max_actions> <sum_visit_length>551</sum_visit_length> - <bounce_count>32</bounce_count> - <nb_visits_converted>33</nb_visits_converted> - <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors> + <bounce_count>33</bounce_count> + <nb_visits_converted>34</nb_visits_converted> + <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <segment>languageCode==xx</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index f23909c920..b381de56d6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -51,13 +51,13 @@ </row> <row> <label>Saturday</label> - <nb_visits>10</nb_visits> - <nb_uniq_visitors>10</nb_uniq_visitors> - <nb_actions>13</nb_actions> + <nb_visits>11</nb_visits> + <nb_uniq_visitors>11</nb_uniq_visitors> + <nb_actions>14</nb_actions> <nb_users>0</nb_users> <sum_visit_length>305</sum_visit_length> - <bounce_count>8</bounce_count> - <nb_visits_converted>8</nb_visits_converted> + <bounce_count>9</bounce_count> + <nb_visits_converted>9</nb_visits_converted> <day_of_week>6</day_of_week> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index e3f6916792..e4f045cd9f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -242,13 +242,13 @@ </row> <row> <label>20h</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <bounce_count>7</bounce_count> + <nb_visits_converted>7</nb_visits_converted> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>visitLocalHour==20</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index da07966d39..fcc08ecee4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -350,21 +350,21 @@ </row> <row> <label>20h</label> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>6</nb_conversions> - <nb_visits_converted>6</nb_visits_converted> - <revenue>30</revenue> + <nb_conversions>7</nb_conversions> + <nb_visits_converted>7</nb_visits_converted> + <revenue>35</revenue> </row> </goals> - <nb_conversions>6</nb_conversions> - <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <nb_conversions>7</nb_conversions> + <revenue>35</revenue> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <segment>visitServerHour==20</segment> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index cfcc9e97d1..43027f77b0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>34</nb_visits> + <nb_visits>35</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index e5413c84fb..a879d261b3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> </row> <row> <label>0 days</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index dbf2a47c48..221a29c2b5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>37</nb_visits> + <nb_visits>38</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index 789e9e8110..11fd85a144 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 visit</label> - <nb_visits>43</nb_visits> + <nb_visits>44</nb_visits> <nb_visits_percentage>86%</nb_visits_percentage> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 8829c9b1a5..0ca3284b5b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>32</nb_visits> + <nb_visits>33</nb_visits> </row> <row> <label>2 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml index d99a7802f0..51ed7da2eb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>1 page</label> - <nb_visits>41</nb_visits> + <nb_visits>42</nb_visits> </row> <row> <label>2 pages</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index eac22754d0..f3e2effb18 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>34</nb_visits> + <nb_visits>35</nb_visits> </row> <row> <label>11-30s</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index 0fa5658a92..b62b79979b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>44</nb_visits> + <nb_visits>45</nb_visits> </row> <row> <label>11-30s</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 1e4ba1a5cb..05473b60f6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>44</result>
\ No newline at end of file +<result>45</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index a946f8e505..95aa700980 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>32</result>
\ No newline at end of file +<result>33</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 8e4b837a62..8af80c337f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>35</result>
\ No newline at end of file +<result>36</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 95aa700980..5c61a82137 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>33</result>
\ No newline at end of file +<result>34</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 51a0bb8472..962fbe983a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>37</result>
\ No newline at end of file +<result>38</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index 1d536766e2..a71746a977 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors>35</nb_uniq_visitors> + <nb_uniq_visitors>36</nb_uniq_visitors> <nb_users>2</nb_users> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> - <nb_visits_converted>33</nb_visits_converted> - <bounce_count>32</bounce_count> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> + <nb_visits_converted>34</nb_visits_converted> + <bounce_count>33</bounce_count> <sum_visit_length>551</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>86%</bounce_rate> + <bounce_rate>87%</bounce_rate> <nb_actions_per_visit>1.2</nb_actions_per_visit> <avg_time_on_site>15</avg_time_on_site> </result>
\ No newline at end of file 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 8d46a2bb1d..2ae237fb14 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 @@ -2,7 +2,7 @@ <result> <row> <idSite>3</idSite> - <idVisit>55</idVisit> + <idVisit>56</idVisit> <visitIp>174.97.139.63</visitIp> <actionDetails> @@ -12,7 +12,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>68</pageId> + <pageId>69</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -117,7 +117,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>48</idVisit> + <idVisit>49</idVisit> <visitIp>206.190.75.8</visitIp> <actionDetails> @@ -127,7 +127,7 @@ <pageTitle>Changelog Archive - Analytics - Piwik</pageTitle> <pageIdAction>44</pageIdAction> - <pageId>59</pageId> + <pageId>60</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -145,7 +145,7 @@ <pageTitle>Contact the Piwik team - Analytics - Piwik</pageTitle> <pageIdAction>55</pageIdAction> - <pageId>67</pageId> + <pageId>68</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -236,7 +236,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>54</idVisit> + <idVisit>55</idVisit> <visitIp>193.159.20.129</visitIp> <actionDetails> @@ -246,7 +246,7 @@ <pageTitle>demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports</pageTitle> <pageIdAction>53</pageIdAction> - <pageId>66</pageId> + <pageId>67</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -363,7 +363,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>52</idVisit> + <idVisit>53</idVisit> <visitIp>50.244.17.130</visitIp> <actionDetails> @@ -373,7 +373,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>63</pageId> + <pageId>64</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -391,7 +391,7 @@ <pageTitle>What is Piwik? - Analytics - Piwik</pageTitle> <pageIdAction>51</pageIdAction> - <pageId>65</pageId> + <pageId>66</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -499,7 +499,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>53</idVisit> + <idVisit>54</idVisit> <visitIp>84.194.72.21</visitIp> <actionDetails> @@ -509,7 +509,7 @@ <pageTitle /> <pageIdAction>49</pageIdAction> - <pageId>64</pageId> + <pageId>65</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -617,7 +617,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>51</idVisit> + <idVisit>52</idVisit> <visitIp>108.211.181.12</visitIp> <actionDetails> @@ -627,7 +627,7 @@ <pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle> <pageIdAction>48</pageIdAction> - <pageId>62</pageId> + <pageId>63</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -744,7 +744,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>50</idVisit> + <idVisit>51</idVisit> <visitIp>219.101.46.222</visitIp> <actionDetails> @@ -754,7 +754,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>42</pageIdAction> - <pageId>61</pageId> + <pageId>62</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -858,7 +858,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>49</idVisit> + <idVisit>50</idVisit> <visitIp>80.136.160.65</visitIp> <actionDetails> @@ -868,7 +868,7 @@ <pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle> <pageIdAction>46</pageIdAction> - <pageId>60</pageId> + <pageId>61</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -965,7 +965,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>47</idVisit> + <idVisit>48</idVisit> <visitIp>188.107.238.9</visitIp> <actionDetails> @@ -975,7 +975,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>42</pageIdAction> - <pageId>58</pageId> + <pageId>59</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1092,7 +1092,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>45</idVisit> + <idVisit>46</idVisit> <visitIp>93.80.130.163</visitIp> <actionDetails> @@ -1102,7 +1102,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>54</pageId> + <pageId>55</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1121,7 +1121,7 @@ <pageTitle>Download - Analytics - Piwik</pageTitle> <pageIdAction>39</pageIdAction> - <pageId>56</pageId> + <pageId>57</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1140,7 +1140,7 @@ <pageTitle /> <pageIdAction>40</pageIdAction> - <pageId>57</pageId> + <pageId>58</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1240,7 +1240,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>46</idVisit> + <idVisit>47</idVisit> <visitIp>176.41.226.154</visitIp> <actionDetails> @@ -1250,7 +1250,7 @@ <pageTitle>Hello Installing Piwik - Analytics - Piwik</pageTitle> <pageIdAction>37</pageIdAction> - <pageId>55</pageId> + <pageId>56</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1359,7 +1359,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>44</idVisit> + <idVisit>45</idVisit> <visitIp>84.194.72.21</visitIp> <actionDetails> @@ -1369,7 +1369,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>35</pageIdAction> - <pageId>53</pageId> + <pageId>54</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1478,7 +1478,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>42</idVisit> + <idVisit>43</idVisit> <visitIp>0.0.0.0</visitIp> <actionDetails> @@ -1488,7 +1488,7 @@ <pageTitle>incredible title!</pageTitle> <pageIdAction>29</pageIdAction> - <pageId>49</pageId> + <pageId>50</pageId> <customVariables> <row> <customVariablePageName3>_pks</customVariablePageName3> @@ -1596,7 +1596,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>43</idVisit> + <idVisit>44</idVisit> <visitIp>0.0.0.0</visitIp> <actionDetails> @@ -1606,7 +1606,7 @@ <pageTitle>Piwik Forums</pageTitle> <pageIdAction>31</pageIdAction> - <pageId>50</pageId> + <pageId>51</pageId> <customVariables> <row> <customVariablePageName1>HTTP-code</customVariablePageName1> @@ -1722,7 +1722,7 @@ </row> <row> <idSite>3</idSite> - <idVisit>29</idVisit> + <idVisit>30</idVisit> <visitIp>0.0.0.0</visitIp> <actionDetails> @@ -1732,7 +1732,7 @@ <pageTitle>Looking at Electronics & Cameras page with a page level custom variable</pageTitle> <pageIdAction>29</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <customVariables> <row> <customVariablePageName5>_pkc</customVariablePageName5> @@ -1750,7 +1750,7 @@ <pageTitle>Another Product page with no category</pageTitle> <pageIdAction>29</pageIdAction> - <pageId>51</pageId> + <pageId>52</pageId> <customVariables> <row> <customVariablePageName3>_pks</customVariablePageName3> @@ -1772,7 +1772,7 @@ <pageTitle>Looking at Electronics & Cameras page with a page level custom variable</pageTitle> <pageIdAction>29</pageIdAction> - <pageId>52</pageId> + <pageId>53</pageId> <customVariables> <row> <customVariablePageName5>_pkc</customVariablePageName5> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index ddd44050a8..4e4c5a220b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,11 +3,11 @@ <result date="2012-08"> <row> <label>Piwik test</label> - <nb_visits>37</nb_visits> - <nb_actions>44</nb_actions> - <nb_pageviews>38</nb_pageviews> - <revenue>165</revenue> - <nb_conversions>33</nb_conversions> + <nb_visits>38</nb_visits> + <nb_actions>45</nb_actions> + <nb_pageviews>39</nb_pageviews> + <revenue>170</revenue> + <nb_conversions>34</nb_conversions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> @@ -58,11 +58,11 @@ <nb_pageviews>10</nb_pageviews> <revenue>5</revenue> <nb_conversions>1</nb_conversions> - <visits_evolution>-97.3%</visits_evolution> - <actions_evolution>-77.3%</actions_evolution> - <pageviews_evolution>-73.7%</pageviews_evolution> - <revenue_evolution>-97%</revenue_evolution> - <nb_conversions_evolution>-97%</nb_conversions_evolution> + <visits_evolution>-97.4%</visits_evolution> + <actions_evolution>-77.8%</actions_evolution> + <pageviews_evolution>-74.4%</pageviews_evolution> + <revenue_evolution>-97.1%</revenue_evolution> + <nb_conversions_evolution>-97.1%</nb_conversions_evolution> <idsite>1</idsite> <group /> <main_url>http://piwik.net</main_url> diff --git a/tests/resources/access-logs/fake_logs_enable_all.log b/tests/resources/access-logs/fake_logs_enable_all.log index 24bafade73..b487279981 100644 --- a/tests/resources/access-logs/fake_logs_enable_all.log +++ b/tests/resources/access-logs/fake_logs_enable_all.log @@ -12,3 +12,5 @@ 175.41.192.43 - - [11/Aug/2012:21:12:40 +0200] "GET /moved-permanently HTTP/1.1" 301 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" 175.41.192.43 - - [11/Aug/2012:21:15:40 +0200] "GET /temp-redirect HTTP/1.1" 307 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" 175.41.192.41 - - [11/Aug/2012:22:15:41 +0200] "GET /BLOG/cAtEgOrY/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" + +0:0:0:0:0:ffff:7b2d:4359 - - [11/Aug/2012:22:15:41 +0200] "GET /BLOG/cAtEgOrY/meta/ HTTP/1.1" 200 3574 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24" |