[Piwik-svn] r171 - in trunk: modules/API modules/Visualization plugins/Home

[svnmaster at piwik.org]

Author: matt
Date: 2008-01-14 06:55:07 +0100 (Mon, 14 Jan 2008)
New Revision: 171

Modified:
   trunk/modules/API/Proxy.php
   trunk/modules/API/Request.php
   trunk/modules/Visualization/OpenFlashChart.php
   trunk/plugins/Home/Controller.php
Log:
fixed few bugs introduced tonight


Modified: trunk/modules/API/Proxy.php
===================================================================
--- trunk/modules/API/Proxy.php	2008-01-14 05:48:48 UTC (rev 170)
+++ trunk/modules/API/Proxy.php	2008-01-14 05:55:07 UTC (rev 171)
@@ -242,10 +242,10 @@
 				
 				if($outputExampleUrls)
 				{
-					$exampleUrl = $prefixUrls;
-					$exampleUrl .= $this->getExampleUrl($class, $methodName);
+					$exampleUrl = $this->getExampleUrl($class, $methodName);
 					if($exampleUrl !== false)
 					{
+						$exampleUrl = $exampleUrl . $prefixUrls;
 						$str .= " [ Example in  
 									<a target=_blank href='$exampleUrl&format=xml'>XML</a>, 
 									<a target=_blank href='$exampleUrl&format=PHP'>PHP</a>, 

Modified: trunk/modules/API/Request.php
===================================================================
--- trunk/modules/API/Request.php	2008-01-14 05:48:48 UTC (rev 170)
+++ trunk/modules/API/Request.php	2008-01-14 05:55:07 UTC (rev 171)
@@ -135,6 +135,7 @@
 			// post process the data
 			$toReturn = $this->handleReturnedValue( $returnedValue );
 			
+			
 		} catch(Exception $e ) {
 			
 			// if it is not a direct API call, we are requesting the original data structure
@@ -225,8 +226,9 @@
 			
 			$returnedValue->applyQueuedFilters();
 			
-			$toReturn = $this->getRenderedDataTable($returnedValue);
+			$toReturn = $this->getRenderedDataTable($returnedValue);
 			
+			
 		}
 		
 		// Case nothing returned (really nothing was 'return'ed), 
@@ -286,7 +288,8 @@
 				return $this->getExceptionOutput( ' The API cannot handle this data structure. You can get the data internally by directly using the class.', $this->outputFormatRequested);
 			}
 			return $this->getStandardSuccessOutput($this->outputFormatRequested, $message = $toReturn);
-		}
+		}
+		return $toReturn;
 	}
 	
 	/**

Modified: trunk/modules/Visualization/OpenFlashChart.php
===================================================================
--- trunk/modules/Visualization/OpenFlashChart.php	2008-01-14 05:48:48 UTC (rev 170)
+++ trunk/modules/Visualization/OpenFlashChart.php	2008-01-14 05:55:07 UTC (rev 171)
@@ -17,7 +17,7 @@
  * @package Piwik_Visualization
  */
 
-abstract class Piwik_Visualization_OpenFlashChart implements iView
+abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView
 {	
     function __construct()
     {

Modified: trunk/plugins/Home/Controller.php
===================================================================
--- trunk/plugins/Home/Controller.php	2008-01-14 05:48:48 UTC (rev 170)
+++ trunk/plugins/Home/Controller.php	2008-01-14 05:55:07 UTC (rev 171)
@@ -174,7 +174,7 @@
 		$view->setLimit( 100 );
 		
 		// computing minimum value to exclude
-		$visitsInfo = $this->getVisitsSummary();
+		$visitsInfo = $this->getVisitsSummary(); 
 		$nbActions = $visitsInfo->getColumn('nb_actions');
 		$nbActionsLowPopulationThreshold = floor(0.02 * $nbActions); // 2 percent of the total number of actions
 		$view->setExcludeLowPopulation( $nbActionsLowPopulationThreshold );