diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:35 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:36 +0400 |
commit | aca8ec33a85e0a70b818b6227145041717d7a69e (patch) | |
tree | 41377e3a9737d63222522ef93ecf8483f3faddfa /core/DataTable/Renderer/Csv.php | |
parent | 0a63210e3eae7562af1a3dbee340eb1ee140db3d (diff) |
Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.
Removed some deprecated code.
Diffstat (limited to 'core/DataTable/Renderer/Csv.php')
-rw-r--r-- | core/DataTable/Renderer/Csv.php | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index 9b2f5505d6..03074897d4 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -8,10 +8,16 @@ * @category Piwik * @package Piwik */ +namespace Piwik\DataTable\Renderer; + +use Piwik\DataTable\Simple; +use Piwik\DataTable\Renderer; use Piwik\Period; -use Piwik\Period_Range; +use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Common; +use Piwik\Date; +use Piwik\DataTable; /** * CSV export @@ -23,9 +29,9 @@ use Piwik\Common; * Formatting and layout are ignored. * * @package Piwik - * @subpackage Piwik_DataTable + * @subpackage DataTable */ -class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer +class Csv extends Renderer { /** * Column separator @@ -119,7 +125,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer /** * Computes the output of the given data table * - * @param Piwik_DataTable|array $table + * @param DataTable|array $table * @param array $allColumns * @return string */ @@ -127,10 +133,10 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer { if (is_array($table)) // convert array to DataTable { - $table = Piwik_DataTable::makeFromSimpleArray($table); + $table = DataTable::makeFromSimpleArray($table); } - if ($table instanceof Piwik_DataTable_Array) { + if ($table instanceof DataTable\Map) { $str = $this->renderDataTableArray($table, $allColumns); } else { $str = $this->renderDataTable($table, $allColumns); @@ -141,7 +147,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer /** * Computes the output of the given data table array * - * @param Piwik_DataTable_Array $table + * @param DataTable\Map $table * @param array $allColumns * @return string */ @@ -176,13 +182,13 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer /** * Converts the output of the given simple data table * - * @param Piwik_DataTable_Simple $table + * @param Simple $table * @param array $allColumns * @return string */ protected function renderDataTable($table, &$allColumns = array()) { - if ($table instanceof Piwik_DataTable_Simple) { + if ($table instanceof Simple) { $row = $table->getFirstRow(); if ($row !== false) { $columnNameToValue = $row->getColumns(); @@ -352,11 +358,11 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer if ($period || $date) // in test cases, there are no request params set { if ($period == 'range') { - $period = new Period_Range($period, $date); + $period = new Range($period, $date); } else if (strpos($date, ',') !== false) { - $period = new Period_Range('range', $date); + $period = new Range('range', $date); } else { - $period = Period::factory($period, Piwik_Date::factory($date)); + $period = Period::factory($period, Date::factory($date)); } $prettyDate = $period->getLocalizedLongString(); |