When the string contains a segment, eg. 'country==de' then the request will...

When the string contains a segment, eg. 'country==de' then the request will trigger archiving, even if archiving was disabled in the UI (as this is a API only behavior until we implement segmentation in the UI)


git-svn-id: http://dev.piwik.org/svn/trunk@3910 59fd770c-687e-43c8-a1e3-f5a4ff64c105

config/global.ini.php

@@ -281,15 +281,12 @@ page_maximum_length = 1024;
 ; for IPv4 addresses, valid values are 0..4
 ip_address_mask_length = 1
 
+[Segments]
 ; Reports with segmentation in API requests are processed in real time. 
 ; On high traffic websites it is recommended to pre-process the data 
 ; so that the analytics reports are always fast to load.
 ; You can define below the list of Segments strings 
 ; for which all reports should be Archived during the cron execution
-
-[Segments]
-; Segments can be listed in this array, so that they are automatically pre-processed
-; during the Archiving process.
 ; All segment values MUST be URL encoded.
 ;Segments[]="visitorType==new"
 ;Segments[]="visitorType==returning"

core/ArchiveProcessing.php

@@ -791,11 +791,17 @@ abstract class Piwik_ArchiveProcessing
 
 	/**
 	 * Returns true if, for some reasons, triggering the archiving is disabled.
+	 * Note that when a segment is passed to the function, archiving will always occur 
+	 * (since segments are by default not pre-processed)
 	 *
 	 * @return bool
 	 */
 	public function isArchivingDisabled()
 	{
+		if(!$this->segment->isEmpty())
+		{
+			return false;
+		}
 		if(!self::isBrowserTriggerArchivingEnabled()
 			&& !Piwik_Common::isPhpCliMode())
 		{

core/Piwik.php

@@ -1349,8 +1349,6 @@ class Piwik
 			'Real Time Analytics',
 			'Open Source Analytics',
 			'Open Source Web Analytics',
-			'Google Analytics alternative',
-			'Open source Google Analytics',
 			'Free Website Analytics',
 			'Free Web Analytics',
 		);