[Piwik-svn] r178 - in trunk: config modules plugins/Actions plugins/Provider plugins/Referers plugins/UserCountry plugins/UserSettings plugins/VisitFrequency plugins/VisitTime plugins/VisitorInterest plugins/VisitsSummary
svnmaster at piwik.org
svnmaster at piwik.org
Thu Jan 17 01:39:13 CET 2008
Author: matt
Date: 2008-01-17 01:39:12 +0100 (Thu, 17 Jan 2008)
New Revision: 178
Modified:
trunk/config/global.ini.php
trunk/modules/Archive.php
trunk/plugins/Actions/API.php
trunk/plugins/Provider/API.php
trunk/plugins/Referers/API.php
trunk/plugins/UserCountry/API.php
trunk/plugins/UserSettings/API.php
trunk/plugins/VisitFrequency/API.php
trunk/plugins/VisitTime/API.php
trunk/plugins/VisitorInterest/API.php
trunk/plugins/VisitsSummary/API.php
Log:
changed api parameters order for consistency fix #20
Modified: trunk/config/global.ini.php
===================================================================
--- trunk/config/global.ini.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/config/global.ini.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -51,7 +51,7 @@
[Debug]
; if set to true, the archiving process will always be triggered, even if the archive has already been computed
; this is useful when making changes to the archiving code so we can
-always_archive_data = false
+always_archive_data = true
[General]
; Time in seconds after which an archive will be computed again.
Modified: trunk/modules/Archive.php
===================================================================
--- trunk/modules/Archive.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/modules/Archive.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -64,8 +64,10 @@
* @param string $period 'week' 'day' etc.
* @return Piwik_Archive
*/
- static public function build($idSite, $date, $period )
+ static public function build($idSite, $period, $date )
{
+// $archive = new Piwik_Archive_Single($date,);
+
$oDate = Piwik_Date::factory($date);
$date = $oDate->toString();
if(isset(self::$alreadyBuilt[$idSite][$date][$period]))
@@ -76,6 +78,7 @@
$oPeriod = Piwik_Period::factory($period, $oDate);
$oSite = new Piwik_Site($idSite);
+
$archive = new Piwik_Archive;
$archive->setPeriod($oPeriod);
$archive->setSite($oSite);
Modified: trunk/plugins/Actions/API.php
===================================================================
--- trunk/plugins/Actions/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/Actions/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -39,7 +39,7 @@
protected function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
if($idSubtable === false)
{
Modified: trunk/plugins/Provider/API.php
===================================================================
--- trunk/plugins/Provider/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/Provider/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -40,7 +40,7 @@
public function getProvider( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('Provider_hostnameExt');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'url', 'Piwik_getHostnameUrl'));
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getHostnameName'));
Modified: trunk/plugins/Referers/API.php
===================================================================
--- trunk/plugins/Referers/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/Referers/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -40,7 +40,7 @@
private function getDataTable($name, $idSite, $period, $date, $idSubtable = null)
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable($name, $idSubtable);
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
@@ -124,7 +124,7 @@
private function getNumeric($name, $idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
return $archive->getDataTableFromNumeric($name);
}
Modified: trunk/plugins/UserCountry/API.php
===================================================================
--- trunk/plugins/UserCountry/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/UserCountry/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -38,7 +38,7 @@
public function getCountry( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserCountry_country');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'code', create_function('$label', 'return $label;')));
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'logo', 'Piwik_getFlagFromCode'));
@@ -51,7 +51,7 @@
public function getContinent( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserCountry_continent');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'code', create_function('$label', 'return $label;')));
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_ContinentTranslate'));
Modified: trunk/plugins/UserSettings/API.php
===================================================================
--- trunk/plugins/UserSettings/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/UserSettings/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -38,7 +38,7 @@
public function getResolution( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_resolution');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
return $dataTable;
@@ -48,7 +48,7 @@
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_configuration');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getConfigurationLabel'));
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
@@ -58,7 +58,7 @@
public function getOS( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_os');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'logo', 'Piwik_getOSLogo'));
@@ -70,7 +70,7 @@
public function getBrowser( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_browser');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'logo', 'Piwik_getBrowsersLogo'));
@@ -82,7 +82,7 @@
public function getBrowserType( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_browserType');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'shortLabel', 'ucfirst'));
@@ -93,7 +93,7 @@
public function getWideScreen( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_wideScreen');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'logo', 'Piwik_getScreensLogo'));
@@ -104,7 +104,7 @@
public function getPlugin( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('UserSettings_plugin');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'logo', 'Piwik_getPluginsLogo'));
Modified: trunk/plugins/VisitFrequency/API.php
===================================================================
--- trunk/plugins/VisitFrequency/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/VisitFrequency/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -35,7 +35,7 @@
public function getSummary( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$toFetch = array(
'nb_visits_returning',
'nb_actions_returning',
Modified: trunk/plugins/VisitTime/API.php
===================================================================
--- trunk/plugins/VisitTime/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/VisitTime/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -36,7 +36,7 @@
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable($name);
//$dataTable->queueFilter('Piwik_DataTable_Filter_Sort', array('label', 'asc'));
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getTimeLabel'));
Modified: trunk/plugins/VisitorInterest/API.php
===================================================================
--- trunk/plugins/VisitorInterest/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/VisitorInterest/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -36,7 +36,7 @@
public function getNumberOfVisitsPerVisitDuration( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('VisitorInterest_timeGap');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
@@ -50,7 +50,7 @@
public function getNumberOfVisitsPerPage( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$dataTable = $archive->getDataTable('VisitorInterest_pageGap');
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
$dataTable->queueFilter('Piwik_DataTable_Filter_Sort', array('label', 'asc', true));
Modified: trunk/plugins/VisitsSummary/API.php
===================================================================
--- trunk/plugins/VisitsSummary/API.php 2008-01-17 00:23:52 UTC (rev 177)
+++ trunk/plugins/VisitsSummary/API.php 2008-01-17 00:39:12 UTC (rev 178)
@@ -35,7 +35,7 @@
public function get( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $date, $period );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
$toFetch = array( 'max_actions',
'nb_uniq_visitors',
More information about the Piwik-svn
mailing list