Refs #4200, change function of AddSummaryRow and move logic to Truncate filter.

1 files changed, 53 insertions, 8 deletions

diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index bea38ad178..56aa4ea5b2 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -24,10 +24,19 @@ class Truncate extends Filter
      * @param DataTable $table
      * @param int $truncateAfter
      */
-    public function __construct($table, $truncateAfter)
+    public function __construct($table,
+                                $truncateAfter,
+                                $labelSummaryRow = DataTable::LABEL_SUMMARY_ROW,
+                                $columnToSortByBeforeTruncating = null,
+                                $deleteRows = true,
+                                $filterRecursive = true)
     {
         parent::__construct($table);
         $this->truncateAfter = $truncateAfter;
+        $this->labelSummaryRow = $labelSummaryRow;
+        $this->columnToSortByBeforeTruncating = $columnToSortByBeforeTruncating;
+        $this->deleteRows = $deleteRows;
+        $this->filterRecursive = $filterRecursive;
     }
 
     /**
@@ -37,15 +46,51 @@ class Truncate extends Filter
      */
     public function filter($table)
     {
-        $table->filter('AddSummaryRow', array($this->truncateAfter));
+        $this->addSummaryRow($table);
         $table->filter('ReplaceSummaryRowLabel');
 
-        foreach ($table->getRows() as $row) {
-            if ($row->isSubtableLoaded()) {
-                $idSubTable = $row->getIdSubDataTable();
-                $subTable = Manager::getInstance()->getTable($idSubTable);
-                $subTable->filter('Truncate', array($this->truncateAfter));
+        if ($this->filterRecursive) {
+            foreach ($table->getRows() as $row) {
+                if ($row->isSubtableLoaded()) {
+                    $idSubTable = $row->getIdSubDataTable();
+                    $subTable = Manager::getInstance()->getTable($idSubTable);
+                    $subTable->filter('Truncate', array($this->truncateAfter));
+                }
             }
         }
     }
-}
+
+    public function addSummaryRow($table)
+    {
+        $table->filter('Sort',
+            array($this->columnToSortByBeforeTruncating, 'desc'));
+
+        if ($table->getRowsCount() <= $this->startRowToSummarize + 1) {
+            return;
+        }
+
+        $rows = $table->getRows();
+        $count = $table->getRowsCount();
+        $newRow = new Row();
+        for ($i = $this->startRowToSummarize; $i < $count; $i++) {
+            if (!isset($rows[$i])) {
+                // case when the last row is a summary row, it is not indexed by $cout but by DataTable::ID_SUMMARY_ROW
+                $summaryRow = $table->getRowFromId(DataTable::ID_SUMMARY_ROW);
+
+                //FIXME: I'm not sure why it could return false, but it was reported in: http://forum.piwik.org/read.php?2,89324,page=1#msg-89442
+                if ($summaryRow) {
+                    $newRow->sumRow($summaryRow, $enableCopyMetadata = false, $table->getMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME));
+                }
+            } else {
+                $newRow->sumRow($rows[$i], $enableCopyMetadata = false, $table->getMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME));
+            }
+        }
+
+        $newRow->setColumns(array('label' => $this->labelSummaryRow) + $newRow->getColumns());
+        if ($this->deleteRows) {
+            $table->filter('Limit', array(0, $this->startRowToSummarize));
+        }
+        $table->addSummaryRow($newRow);
+        unset($rows);
+    }
+}
\ No newline at end of file