diff options
33 files changed, 203 insertions, 1780 deletions
diff --git a/.gitignore b/.gitignore index fcb76175f6..a121288446 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ php_errors.log *.tmp *.pyc .DS_Store +processed/*xml /bootstrap.php /build @@ -40,7 +40,8 @@ require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php') : PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency if(!defined('PIWIK_PRINT_ERROR_BACKTRACE')) { - define('PIWIK_PRINT_ERROR_BACKTRACE', false); + // TODO revert + define('PIWIK_PRINT_ERROR_BACKTRACE', true); } require_once PIWIK_INCLUDE_PATH . '/core/dispatch.php';
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 241be92f2f..55ba5d088a 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -26,8 +26,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -41,13 +39,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -56,17 +49,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -91,9 +73,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> @@ -126,8 +126,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -141,13 +139,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -156,17 +149,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -187,9 +169,27 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 241be92f2f..55ba5d088a 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -26,8 +26,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -41,13 +39,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -56,17 +49,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -91,9 +73,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> @@ -126,8 +126,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -141,13 +139,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -156,17 +149,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -187,9 +169,27 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 241be92f2f..55ba5d088a 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -26,8 +26,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -41,13 +39,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -56,17 +49,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -91,9 +73,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> @@ -126,8 +126,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -141,13 +139,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -156,17 +149,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -187,9 +169,27 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 241be92f2f..55ba5d088a 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -26,8 +26,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -41,13 +39,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -56,17 +49,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -91,9 +73,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> @@ -126,8 +126,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -141,13 +139,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -156,17 +149,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -187,9 +169,27 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 241be92f2f..55ba5d088a 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -26,8 +26,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -41,13 +39,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -56,17 +49,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -91,9 +73,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> @@ -126,8 +126,6 @@ - <searches>0</searches> - <actions>1</actions> <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> @@ -141,13 +139,8 @@ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>271</visitDuration> <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl /> + <searches>0</searches> + <actions>1</actions> <referrerType>direct</referrerType> <referrerTypeName>Direct Entry</referrerTypeName> <referrerName /> @@ -156,17 +149,6 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WXP</operatingSystemCode> <operatingSystemShortName>Win XP</operatingSystemShortName> @@ -187,9 +169,27 @@ <pluginName>director</pluginName> </row> </pluginsIcons> + <deviceType>Desktop</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> <visitLocalTime>12:34:06</visitLocalTime> <visitLocalHour>12</visitLocalHour> <daysSinceLastVisit>0</daysSinceLastVisit> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl /> + <customVariables> + </customVariables> diff --git a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml deleted file mode 100644 index d3e1af1e2e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <website>Piwik test</website> - <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate> - <metadata> - <category>Actions</category> - <name>Content Name</name> - <module>Contents</module> - <action>getContentNames</action> - <dimension>Content Name</dimension> - <metrics> - <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> - </metrics> - <processedMetrics> - <interaction_rate>Interaction Rate</interaction_rate> - </processedMetrics> - <actionToLoadSubTables>getContentNames</actionToLoadSubTables> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentNames&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentNames&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl> - <uniqueId>Contents_getContentNames</uniqueId> - </metadata> - <columns> - <label>Content Name</label> - <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> - <interaction_rate>Interaction Rate</interaction_rate> - </columns> - <reportData> - <result prettyDate="Sunday 3 January 2010"> - <row> - <label>ImageAd</label> - <nb_impressions>8</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>25%</interaction_rate> - </row> - <row> - <label>Text Ad</label> - <nb_impressions>6</nb_impressions> - <nb_interactions>4</nb_interactions> - <interaction_rate>66.67%</interaction_rate> - </row> - <row> - <label>Video Ad</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - </row> - </result> - <result prettyDate="Monday 4 January 2010" /> - <result prettyDate="Tuesday 5 January 2010" /> - <result prettyDate="Wednesday 6 January 2010" /> - <result prettyDate="Thursday 7 January 2010" /> - <result prettyDate="Friday 8 January 2010" /> - <result prettyDate="Saturday 9 January 2010" /> - </reportData> - <reportMetadata> - <result prettyDate="Sunday 3 January 2010"> - <row> - <contentTarget>http://www.example.com</contentTarget> - - </row> - <row> - <contentTarget>http://piwik.org/</contentTarget> - - </row> - <row> - <contentTarget /> - - </row> - </result> - <result prettyDate="Monday 4 January 2010" /> - <result prettyDate="Tuesday 5 January 2010" /> - <result prettyDate="Wednesday 6 January 2010" /> - <result prettyDate="Thursday 7 January 2010" /> - <result prettyDate="Friday 8 January 2010" /> - <result prettyDate="Saturday 9 January 2010" /> - </reportMetadata> - <reportTotal> - <nb_visits>16</nb_visits> - <nb_uniq_visitors>16</nb_uniq_visitors> - </reportTotal> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml deleted file mode 100644 index 402909f7d5..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <website>Piwik test</website> - <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate> - <metadata> - <category>Actions</category> - <name>Content Piece</name> - <module>Contents</module> - <action>getContentPieces</action> - <dimension>Content Piece</dimension> - <metrics> - <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> - </metrics> - <processedMetrics> - <interaction_rate>Interaction Rate</interaction_rate> - </processedMetrics> - <actionToLoadSubTables>getContentPieces</actionToLoadSubTables> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentPieces&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentPieces&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl> - <uniqueId>Contents_getContentPieces</uniqueId> - </metadata> - <columns> - <label>Content Piece</label> - <nb_impressions>Impressions</nb_impressions> - <nb_interactions>Interactions</nb_interactions> - <interaction_rate>Interaction Rate</interaction_rate> - </columns> - <reportData> - <result prettyDate="Sunday 3 January 2010"> - <row> - <label>Click to download Piwik now</label> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>50%</interaction_rate> - </row> - <row> - <label>/path/ad.jpg</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - </row> - <row> - <label>/path/ad2.jpg</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - </row> - <row> - <label>Click NOW</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - </row> - <row> - <label>movie.mov</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - </row> - <row> - <label>Content Piece not defined</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - </row> - <row> - <label>Unknown</label> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - </row> - </result> - <result prettyDate="Monday 4 January 2010" /> - <result prettyDate="Tuesday 5 January 2010" /> - <result prettyDate="Wednesday 6 January 2010" /> - <result prettyDate="Thursday 7 January 2010" /> - <result prettyDate="Friday 8 January 2010" /> - <result prettyDate="Saturday 9 January 2010" /> - </reportData> - <reportMetadata> - <result prettyDate="Sunday 3 January 2010"> - <row> - <contentTarget>http://piwik.org/download</contentTarget> - - </row> - <row> - <contentTarget>http://www.example.com</contentTarget> - - </row> - <row> - <contentTarget>http://www.example.com</contentTarget> - - </row> - <row> - <contentTarget>http://piwik.org/</contentTarget> - - </row> - <row> - <contentTarget /> - - </row> - <row> - <contentTarget /> - - </row> - <row> - <contentTarget /> - - </row> - </result> - <result prettyDate="Monday 4 January 2010" /> - <result prettyDate="Tuesday 5 January 2010" /> - <result prettyDate="Wednesday 6 January 2010" /> - <result prettyDate="Thursday 7 January 2010" /> - <result prettyDate="Friday 8 January 2010" /> - <result prettyDate="Saturday 9 January 2010" /> - </reportMetadata> - <reportTotal> - <nb_visits>16</nb_visits> - <nb_uniq_visitors>16</nb_uniq_visitors> - </reportTotal> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml deleted file mode 100644 index fde347f2b5..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/page</label> - <nb_visits>2</nb_visits> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_hits>2</nb_hits> - <sum_time_spent>540</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.333</min_time_generation> - <max_time_generation>0.333</max_time_generation> - <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>542</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> - <exit_nb_visits>2</exit_nb_visits> - <avg_time_on_page>270</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0.333</avg_time_generation> - <url>http://www.example.org/page</url> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml deleted file mode 100644 index 3dc775d40a..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/page</label> - <nb_visits>2</nb_visits> - <nb_hits>2</nb_hits> - <sum_time_spent>540</sum_time_spent> - <nb_hits_with_time_generation>2</nb_hits_with_time_generation> - <min_time_generation>0.333</min_time_generation> - <max_time_generation>0.333</max_time_generation> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>542</entry_sum_visit_length> - <entry_bounce_count>2</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>270</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0.333</avg_time_generation> - <url>http://www.example.org/page</url> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml deleted file mode 100644 index f51cfaf913..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <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> - <avg_time_generation>0.335</avg_time_generation> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml deleted file mode 100644 index f51cfaf913..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <nb_pageviews>2</nb_pageviews> - <nb_uniq_pageviews>2</nb_uniq_pageviews> - <nb_downloads>0</nb_downloads> - <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> - <avg_time_generation>0.335</avg_time_generation> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml deleted file mode 100644 index 957c6fa85a..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>ImageAd</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>8</nb_visits> - <nb_impressions>8</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>25%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Text Ad</label> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_impressions>6</nb_impressions> - <nb_interactions>4</nb_interactions> - <interaction_rate>66.67%</interaction_rate> - <contentTarget>http://piwik.org/</contentTarget> - </row> - <row> - <label>Video Ad</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml deleted file mode 100644 index 44bfdfd54e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>ImageAd</label> - <nb_visits>8</nb_visits> - <nb_impressions>8</nb_impressions> - <nb_interactions>2</nb_interactions> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> - <interaction_rate>25%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Text Ad</label> - <nb_visits>6</nb_visits> - <nb_impressions>6</nb_impressions> - <nb_interactions>4</nb_interactions> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> - <interaction_rate>66.67%</interaction_rate> - <contentTarget>http://piwik.org/</contentTarget> - </row> - <row> - <label>Video Ad</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml deleted file mode 100644 index 8927f8a8ec..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Click to download Piwik now</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>50%</interaction_rate> - <contentTarget>http://piwik.org/download</contentTarget> - </row> - <row> - <label>/path/ad.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>/path/ad2.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Click NOW</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://piwik.org/</contentTarget> - </row> - <row> - <label>movie.mov</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> - <row> - <label>Content Piece not defined</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> - <row> - <label>Unknown</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml deleted file mode 100644 index b604544417..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Click to download Piwik now</label> - <nb_visits>4</nb_visits> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <interaction_rate>50%</interaction_rate> - <contentTarget>http://piwik.org/download</contentTarget> - </row> - <row> - <label>/path/ad.jpg</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>/path/ad2.jpg</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>0%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Click NOW</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://piwik.org/</contentTarget> - </row> - <row> - <label>movie.mov</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> - <row> - <label>Content Piece not defined</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> - <row> - <label>Unknown</label> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 989f816722..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> - <row> - <idSite>1</idSite> - <idVisit>2</idVisit> - <visitIp>111.1.1.1</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>13</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml deleted file mode 100644 index 989f816722..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> - <row> - <idSite>1</idSite> - <idVisit>2</idVisit> - <visitIp>111.1.1.1</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>13</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 989f816722..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> - <row> - <idSite>1</idSite> - <idVisit>2</idVisit> - <visitIp>111.1.1.1</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>13</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml deleted file mode 100644 index 5212486a1c..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>ImageAd</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>50%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml deleted file mode 100644 index ac1d39a577..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>/path/ad.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>/path/ad2.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 989f816722..0000000000 --- a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> - <row> - <idSite>1</idSite> - <idVisit>2</idVisit> - <visitIp>111.1.1.1</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>13</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml deleted file mode 100644 index 17b781db1c..0000000000 --- a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>ImageAd</label> - <nb_uniq_visitors>8</nb_uniq_visitors> - <nb_visits>8</nb_visits> - <nb_impressions>8</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>25%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Text Ad</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>50%</interaction_rate> - <contentTarget>http://piwik.org/download</contentTarget> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml deleted file mode 100644 index 7df6e4f0e1..0000000000 --- a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Click to download Piwik now</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_impressions>4</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>50%</interaction_rate> - <contentTarget>http://piwik.org/download</contentTarget> - </row> - <row> - <label>/path/ad.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>2</nb_interactions> - <interaction_rate>100%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>/path/ad2.jpg</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget>http://www.example.com</contentTarget> - </row> - <row> - <label>Content Piece not defined</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> - <row> - <label>Unknown</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_impressions>2</nb_impressions> - <nb_interactions>0</nb_interactions> - <interaction_rate>0%</interaction_rate> - <contentTarget /> - </row> -</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml deleted file mode 100644 index 989f816722..0000000000 --- a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ /dev/null @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <idSite>1</idSite> - <idVisit>1</idVisit> - <visitIp>156.5.3.2</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>1</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>flash, java</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> - <pluginName>flash</pluginName> - </row> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> - <pluginName>java</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> - <row> - <idSite>1</idSite> - <idVisit>2</idVisit> - <visitIp>111.1.1.1</visitIp> - - <actionDetails> - <row> - <type>action</type> - <url>http://www.example.org/page</url> - <pageTitle>Ads</pageTitle> - <pageIdAction>2</pageIdAction> - - <pageId>13</pageId> - <generationTime>0.33s</generationTime> - <timeSpent>0</timeSpent> - <timeSpentPretty>0s</timeSpentPretty> - <icon /> - </row> - </actionDetails> - <goalConversions>0</goalConversions> - <siteCurrency>USD</siteCurrency> - <siteCurrencySymbol>$</siteCurrencySymbol> - - - - - <searches>0</searches> - <actions>1</actions> - <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitCount>1</visitCount> - - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <daysSinceFirstVisit>0</daysSinceFirstVisit> - <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <visitDuration>271</visitDuration> - <visitDurationPretty>4 min 31s</visitDurationPretty> - <customVariables> - </customVariables> - <deviceType>Desktop</deviceType> - <events>0</events> - <provider>Unknown</provider> - <providerName>Unknown</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> - <referrerType>direct</referrerType> - <referrerTypeName>Direct Entry</referrerTypeName> - <referrerName /> - <referrerKeyword /> - <referrerKeywordPosition /> - <referrerUrl /> - <referrerSearchEngineUrl /> - <referrerSearchEngineIcon /> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemShortName>Win XP</operatingSystemShortName> - <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> - <browserFamily>gecko</browserFamily> - <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> - <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> - <browserCode>FF</browserCode> - <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> - <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> - <plugins>director</plugins> - <pluginsIcons> - <row> - <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> - <pluginName>director</pluginName> - </row> - </pluginsIcons> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - <daysSinceLastVisit>0</daysSinceLastVisit> - - - - - - </row> -</result>
\ No newline at end of file diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 36fd4f9879edc47fd7a2f4d1f0a6b06a5608e80 +Subproject 8e754d154afe8ae64c5a9f667a24c99ad673bd1 diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 6100f9642a51ee82b613d4f25595e4ee914878a +Subproject 2e810ad80b3fd240c3231334efb62cd0468d125 |