diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-06-18 08:14:49 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-06-18 08:14:49 +0400 |
commit | 621db6a16a37374aed623f75ea8cdabdf2b8e8d0 (patch) | |
tree | 6cc0365cf90f2d82dcdc5321043fe99aeabd8141 /plugins/CustomVariables | |
parent | d8ac3977a27b41b1a87caceb2f9766a6305391cf (diff) |
Adding new Metrics class that knows about all metrics. Moving from Piwik_Archive class.
Also moved some other const to Piwik class.
Diffstat (limited to 'plugins/CustomVariables')
-rw-r--r-- | plugins/CustomVariables/API.php | 2 | ||||
-rw-r--r-- | plugins/CustomVariables/Archiver.php | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 96d05c4c30..338eb6d74a 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -42,7 +42,7 @@ class Piwik_CustomVariables_API protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable) { $dataTable = Piwik_Archive::getDataTableFromArchive(Piwik_CustomVariables_Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $idSubtable); - $dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); + $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors'); return $dataTable; diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 4da4af9e29..4b63845215 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -42,7 +42,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver $table = $this->getProcessor()->getDataTableFromDataArray($this->dataArray); $blob = $table->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, - $columnToSort = Piwik_Archive::INDEX_NB_VISITS + $columnToSort = Piwik_Metrics::INDEX_NB_VISITS ); $this->getProcessor()->insertBlobRecord(self::CUSTOM_VARIABLE_RECORD_NAME, $blob); @@ -75,7 +75,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver protected function getSelectAveragePrice() { return Piwik_DataAccess_LogAggregator::getSqlRevenue("AVG(log_link_visit_action.custom_var_v2)") - . " as `" . Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; + . " as `" . Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; } protected function aggregateFromVisits($query, $keyField, $valueField) @@ -150,7 +150,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver if ($this->isReservedKey($key)) { // Price tracking on Ecommerce product/category pages: // the average is returned from the SQL query so the price is not "summed" like other metrics - $index = Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED; + $index = Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED; if (!empty($row[$index])) { $this->dataArray->setRowColumnPivot($key, $value, $index, (float)$row[$index]); } @@ -183,8 +183,8 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver if (!self::isReservedKey($key) && Piwik_DataArray::isRowActions($row) ) { - unset($row[Piwik_Archive::INDEX_NB_UNIQ_VISITORS]); - unset($row[Piwik_Archive::INDEX_NB_VISITS]); + unset($row[Piwik_Metrics::INDEX_NB_UNIQ_VISITORS]); + unset($row[Piwik_Metrics::INDEX_NB_VISITS]); } } } @@ -193,6 +193,6 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver { $nameToCount = $this->getProcessor()->aggregateDataTableReports( self::CUSTOM_VARIABLE_RECORD_NAME, $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, - $columnToSort = Piwik_Archive::INDEX_NB_VISITS); + $columnToSort = Piwik_Metrics::INDEX_NB_VISITS); } }
\ No newline at end of file |