diff --git a/tests/integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/integration/expected/test_ImportLogs__Actions.get_month.xml index e7e8a04ceae869d88ab4674179f88bc003d93fb0..0cb16f1ed7af583a88d6e3dc93834460478e8c4e 100755 --- a/tests/integration/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/integration/expected/test_ImportLogs__Actions.get_month.xml @@ -7,6 +7,5 @@ <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> - <nb_uniq_searches>0</nb_uniq_searches> <nb_keywords>0</nb_keywords> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml index 26ee55e166af6e94565ef6cf629f43d8859fad37..a3d15825bc227aee50d0743072fc8336c4182090 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml @@ -7,6 +7,5 @@ <nb_outlinks>3</nb_outlinks> <nb_uniq_outlinks>2</nb_uniq_outlinks> <nb_searches>0</nb_searches> - <nb_uniq_searches>0</nb_uniq_searches> <nb_keywords>0</nb_keywords> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index f52444b741e353ab73cf5c774aa19e7a04182a0b..879e8a333ff78166dbbc106b0ee823ede5327629 100755 --- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> @@ -24,9 +24,9 @@ <revenue>43</revenue> <city_name>Unknown</city_name> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index 8147c389d026a0db9bf5ec52be9494af84114c48..cccafaa0f25487323e3bdac651a2cf996fb7e393 100755 --- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> @@ -23,9 +23,9 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv index 01bc3dbb74b6d0798a458625e7648d5f4ba05771..8658ec505fccd953c176ff6568b9a13c1883e583 100755 Binary files a/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml index cf119fe30acba5def4c830fa8d16f621b2e53bf8..fde425ab9efa9d7bdb3e798380d7c84220237cb7 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml @@ -3,7 +3,6 @@ <row> <label>Banks Own The World</label> <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> <sum_time_spent>108</sum_time_spent> <nb_pages_per_search>1</nb_pages_per_search> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml index 1cc6441a80b54ba8860ea143ef28452e36cfa039..51d95b38b370e3ee5681a636e34ac207a5099a44 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml @@ -7,6 +7,5 @@ <nb_outlinks>3</nb_outlinks> <nb_uniq_outlinks>2</nb_uniq_outlinks> <nb_searches>1</nb_searches> - <nb_uniq_searches>1</nb_uniq_searches> <nb_keywords>1</nb_keywords> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index c34243c281334e33a7c6a3c0b9f6e131f511f56b..4cc982844147694b93e33842b0108f842aead351 100755 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> @@ -24,9 +24,9 @@ <revenue>43</revenue> <city_name>Unknown</city_name> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index ba67b4e753879af47cb4d06dd9f9734fdb57fa8d..7994ac8c81ada04a6f11587048c99f9096cf23b0 100755 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> @@ -23,9 +23,9 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf index 7eac1c11d87d2ce241059c8734d551b9fe98160d..3fd0cdc28149d28316ecd855cbad495703e782a2 100644 Binary files a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf and b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf differ diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 4a996d4fa88630ebd4985a931a8ef7337e891ed0..243fb8e85089791db2a9cc1bdbe371e0f3867c32 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -436,6 +436,8 @@ <nb_uniq_downloads>Unique Downloads</nb_uniq_downloads> <nb_outlinks>Outlinks</nb_outlinks> <nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks> + <nb_searches>Searches</nb_searches> + <nb_keywords>Unique Keywords</nb_keywords> </metrics> <metricsDocumentation> @@ -445,6 +447,7 @@ <nb_uniq_downloads>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_downloads> <nb_outlinks>The number of times this link was clicked.</nb_outlinks> <nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks> + <nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches> </metricsDocumentation> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> @@ -1942,6 +1945,8 @@ <nb_uniq_downloads>Unique Downloads</nb_uniq_downloads> <nb_outlinks>Outlinks</nb_outlinks> <nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks> + <nb_searches>Searches</nb_searches> + <nb_keywords>Unique Keywords</nb_keywords> <nb_visits_returning>Returning Visits</nb_visits_returning> <nb_actions_returning>Actions by Returning Visits</nb_actions_returning> <avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning> @@ -1967,6 +1972,7 @@ <nb_uniq_downloads>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_downloads> <nb_outlinks>The number of times this link was clicked.</nb_outlinks> <nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks> + <nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches> </metricsDocumentation> <uniqueId>API_get</uniqueId> diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/integration/expected/test_apiGetReportMetadata__API.get_day.xml index cefd78bdf5607c7e5fe7b7609288490e069de347..33cec8dbe38fb0f69d6a3088fe718e55300bec43 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.get_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.get_day.xml @@ -23,4 +23,6 @@ <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> + <nb_searches>0</nb_searches> + <nb_keywords>0</nb_keywords> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml b/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml index 78a0291e685bf1b424dcc0eb8aca9de72106b191..8121c0e53bbec3393503e6bce467e344cacbefa2 100755 --- a/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml @@ -12,6 +12,8 @@ <nb_uniq_downloads>Unique Downloads</nb_uniq_downloads> <nb_outlinks>Outlinks</nb_outlinks> <nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks> + <nb_searches>Searches</nb_searches> + <nb_keywords>Unique Keywords</nb_keywords> </metrics> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> diff --git a/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml b/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml index 34421201f0839f3df8c3c388b21e256f24495cf4..3dde14e284f9fefede4c99a5e82197a647f70b9f 100755 --- a/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml @@ -14,6 +14,8 @@ <nb_uniq_downloads>Unique Downloads</nb_uniq_downloads> <nb_outlinks>Outlinks</nb_outlinks> <nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks> + <nb_searches>Searches</nb_searches> + <nb_keywords>Unique Keywords</nb_keywords> </metrics> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> @@ -28,6 +30,8 @@ <nb_uniq_downloads>Unique Downloads</nb_uniq_downloads> <nb_outlinks>Outlinks</nb_outlinks> <nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks> + <nb_searches>Searches</nb_searches> + <nb_keywords>Unique Keywords</nb_keywords> </columns> <reportData> @@ -37,6 +41,8 @@ <nb_uniq_downloads>0</nb_uniq_downloads> <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> + <nb_searches>0</nb_searches> + <nb_keywords>0</nb_keywords> </reportData> <reportMetadata/> diff --git a/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml index ebd01d4cd82dcb07d526450e906cd4f4b314dd37..a26ec5c0b2bd9ced98fc1ab2d8f454fada03a01d 100755 --- a/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> @@ -35,9 +35,9 @@ <revenue>3121.11</revenue> <city_name>Unknown</city_name> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml index ee5aa8a2b398565af09725ce684c2ed679c71d1b..fd669cef9720e82e067230f2658bd99d241d4e6e 100755 --- a/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml +++ b/tests/integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown, France</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> @@ -34,9 +34,9 @@ <nb_conversions>3</nb_conversions> <revenue>3121.11</revenue> <region>xx</region> - <country>fr</country> - <country_name>France</country_name> + <country>xx</country> + <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/flags/xx.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html index cd0a58a8f8c29b01dded08ec92cd474579f865b4..b304478934c41bca2332dc48b7ec5541bbce5187 100644 --- a/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html +++ b/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html @@ -3146,6 +3146,22 @@ Unique Outlinks 0 </td> </tr> +<tr style=""> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +Searches +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +0 +</td> +</tr> +<tr style="background-color: rgb(249,250,250)"> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +Unique Keywords +</td> +<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> +0 +</td> +</tr> </tbody> </table> <br/> @@ -4521,8 +4537,8 @@ Region <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> -Unknown, France +<img src='plugins/UserCountry/flags/xx.png'> +Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 @@ -4579,8 +4595,8 @@ City <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> -Unknown, France +<img src='plugins/UserCountry/flags/xx.png'> +Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 diff --git a/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf b/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf index f135f1a2849d901e79c03bb2bad4f08314e981ba..be41f0517630fa749894d3e1dab0b28bd1132e31 100644 Binary files a/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf and b/tests/integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf differ diff --git a/tests/integration/expected/test_noVisit__Actions.get_day.xml b/tests/integration/expected/test_noVisit__Actions.get_day.xml index 93eca2608e78cb5654718df6a2bc40923a768d9c..6006b449a7486f35374de7cfb91eaa76b6269e9d 100644 --- a/tests/integration/expected/test_noVisit__Actions.get_day.xml +++ b/tests/integration/expected/test_noVisit__Actions.get_day.xml @@ -7,6 +7,5 @@ <nb_outlinks>0</nb_outlinks> <nb_uniq_outlinks>0</nb_uniq_outlinks> <nb_searches>0</nb_searches> - <nb_uniq_searches>0</nb_uniq_searches> <nb_keywords>0</nb_keywords> </result> \ No newline at end of file diff --git a/tests/integration/processed/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/integration/processed/test_OneVisitorTwoVisits_csv__API.get_month.csv index 01bc3dbb74b6d0798a458625e7648d5f4ba05771..8658ec505fccd953c176ff6568b9a13c1883e583 100644 Binary files a/tests/integration/processed/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/integration/processed/test_OneVisitorTwoVisits_csv__API.get_month.csv differ