[Piwik-svn] r197 - trunk/plugins
svnmaster at piwik.org
svnmaster at piwik.org
Sat Jan 19 18:28:13 CET 2008
Author: matt
Date: 2008-01-19 18:28:13 +0100 (Sat, 19 Jan 2008)
New Revision: 197
Modified:
trunk/plugins/Actions.php
trunk/plugins/Provider.php
trunk/plugins/Referers.php
trunk/plugins/UserCountry.php
trunk/plugins/UserSettings.php
trunk/plugins/VisitFrequency.php
trunk/plugins/VisitTime.php
trunk/plugins/VisitorInterest.php
Log:
special mikael comit
Modified: trunk/plugins/Actions.php
===================================================================
--- trunk/plugins/Actions.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/Actions.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -62,7 +62,7 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'Actions_actions',
@@ -70,7 +70,7 @@
'Actions_outlink',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
/**
Modified: trunk/plugins/Provider.php
===================================================================
--- trunk/plugins/Provider.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/Provider.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -65,13 +65,13 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'Provider_hostnameExt',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
/**
@@ -79,11 +79,11 @@
*/
function archiveDay($notification)
{
- $this->ArchiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$recordName = 'Provider_hostnameExt';
$labelSQL = "location_provider";
- $tableProvider = $this->ArchiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableProvider = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableProvider->getSerialized());
// echo $tableProvider;
// Piwik::printMemoryUsage("End of ".get_class($this)." ");
Modified: trunk/plugins/Referers.php
===================================================================
--- trunk/plugins/Referers.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/Referers.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -60,7 +60,7 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'Referers_type',
@@ -71,7 +71,7 @@
'Referers_urlByPartner',
);
- $nameToCount = $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $nameToCount = $archiveProcessing->archiveDataTable($dataTableToSum);
$mappingFromArchiveName = array(
'Referers_distinctSearchEngines' =>
Modified: trunk/plugins/UserCountry.php
===================================================================
--- trunk/plugins/UserCountry.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/UserCountry.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -56,28 +56,28 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'UserCountry_country',
'UserCountry_continent',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
function archiveDay($notification)
{
- $this->ArchiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$recordName = 'UserCountry_country';
$labelSQL = "location_country";
- $tableCountry = $this->ArchiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableCountry = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableCountry->getSerialized());
// echo $tableCountry;
$recordName = 'UserCountry_continent';
$labelSQL = "location_continent";
- $tableContinent = $this->ArchiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableContinent = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableContinent->getSerialized());
// echo $tableContinent;
// Piwik::printMemoryUsage("End of ".get_class($this)." ");
Modified: trunk/plugins/UserSettings.php
===================================================================
--- trunk/plugins/UserSettings.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/UserSettings.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -139,21 +139,24 @@
function archiveDay( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
+ // used in the methods
+ $this->archiveProcessing = $archiveProcessing;
+
$recordName = 'UserSettings_configuration';
$labelSQL = "CONCAT(config_os, ';', config_browser_name, ';', config_resolution)";
- $tableConfiguration = $this->archiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableConfiguration = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableConfiguration->getSerialized());
$recordName = 'UserSettings_os';
$labelSQL = "config_os";
- $tableOs = $this->archiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableOs = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableOs->getSerialized());
$recordName = 'UserSettings_browser';
$labelSQL = "CONCAT(config_browser_name, ';', config_browser_version)";
- $tableBrowser = $this->archiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableBrowser = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableBrowser->getSerialized());
$recordName = 'UserSettings_browserType';
@@ -162,7 +165,7 @@
$recordName = 'UserSettings_resolution';
$labelSQL = "config_resolution";
- $tableResolution = $this->archiveProcessing->getDataTableInterestForLabel($labelSQL);
+ $tableResolution = $archiveProcessing->getDataTableInterestForLabel($labelSQL);
$filter = new Piwik_DataTable_Filter_ColumnCallback($tableResolution, 'label', 'Piwik_UserSettings_keepStrlenGreater');
$record = new Piwik_ArchiveProcessing_Record_Blob_Array($recordName, $tableResolution->getSerialized());
@@ -182,7 +185,7 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'UserSettings_configuration',
@@ -194,7 +197,7 @@
'UserSettings_plugin',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
protected function getDataTablePlugin()
Modified: trunk/plugins/VisitFrequency.php
===================================================================
--- trunk/plugins/VisitFrequency.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/VisitFrequency.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -53,7 +53,7 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$numericToSum = array(
'nb_visits_returning',
@@ -62,14 +62,14 @@
'bounce_count_returning',
);
- $this->archiveProcessing->archiveNumericValuesSum($numericToSum);
+ $archiveProcessing->archiveNumericValuesSum($numericToSum);
- $this->archiveProcessing->archiveNumericValuesMax('max_actions_returning');
+ $archiveProcessing->archiveNumericValuesMax('max_actions_returning');
}
function archiveDay($notification)
{
- $this->ArchiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$query = "SELECT count(distinct visitor_idcookie) as nb_uniq_visitors_returning,
count(*) as nb_visits_returning,
@@ -77,12 +77,12 @@
max(visit_total_actions) as max_actions_returning,
sum(visit_total_time) as sum_visit_length_returning,
sum(case visit_total_actions when 1 then 1 else 0 end) as bounce_count_returning
- FROM ".$this->ArchiveProcessing->logTable."
+ FROM ".$archiveProcessing->logTable."
WHERE visit_server_date = ?
AND idsite = ?
AND visitor_returning = 1
GROUP BY visitor_returning";
- $row = $this->ArchiveProcessing->db->fetchRow($query, array( $this->ArchiveProcessing->strDateStart, $this->ArchiveProcessing->idsite ) );
+ $row = $archiveProcessing->db->fetchRow($query, array( $archiveProcessing->strDateStart, $archiveProcessing->idsite ) );
if($row==false)
{
Modified: trunk/plugins/VisitTime.php
===================================================================
--- trunk/plugins/VisitTime.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/VisitTime.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -54,14 +54,14 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'VisitTime_localTime',
'VisitTime_serverTime',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
public function archiveDay( $notification )
{
Modified: trunk/plugins/VisitorInterest.php
===================================================================
--- trunk/plugins/VisitorInterest.php 2008-01-19 15:41:52 UTC (rev 196)
+++ trunk/plugins/VisitorInterest.php 2008-01-19 17:28:13 UTC (rev 197)
@@ -80,17 +80,18 @@
function archiveMonth( $notification )
{
- $this->archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessing = $notification->getNotificationObject();
$dataTableToSum = array(
'VisitorInterest_timeGap',
'VisitorInterest_pageGap',
);
- $this->archiveProcessing->archiveDataTable($dataTableToSum);
+ $archiveProcessing->archiveDataTable($dataTableToSum);
}
public function archiveDay( $notification )
{
+ // used in protected methods
$this->archiveProcessing = $notification->getNotificationObject();
$recordName = 'VisitorInterest_timeGap';
More information about the Piwik-svn
mailing list