Ticket #1128: DataTable.php.diff

DataTable.php

@@ -147 +147 @@
          */
         protected $currentId;
         
+        protected $nextRowId = 0;//new added
+        
+        
         /**
          * Current depth level of this data table
          * 0 is the parent data table
@@ -160 +163 @@
          * 
          * @var bool
          */
-        protected $indexNotUpToDate = true;
+        //protected $indexNotUpToDate = true;
         
         /**
          * This flag sets the index to be rebuild whenever a new row is added, 
@@ -170 +173 @@
          * 
          * @var bool
          */
-        protected $rebuildIndexContinuously = false;
+        //protected $rebuildIndexContinuously = false;
         
         /**
          * Column name of last time the table was sorted
@@ -252 +255 @@
          */
         public function sort( $functionCallback, $columnSortedBy )
         {
-                $this->indexNotUpToDate = true;
+                //$this->indexNotUpToDate = true;
                 $this->tableSortedBy = $columnSortedBy;
                 usort( $this->rows, $functionCallback );
                 
@@ -414 +417 @@
          */
         public function getRowFromLabel( $label )
         {
-                $this->rebuildIndexContinuously = true;
+    /*  $this->rebuildIndexContinuously = true;
                 if($this->indexNotUpToDate)
                 {
                         $this->rebuildIndex();
                 }
-                
+        */      
                 if($label === self::LABEL_SUMMARY_ROW
                         && !is_null($this->summaryRow))
                 {
@@ -437 +440 @@
         /**
          * Rebuilds the index used to lookup a row by label
          */
+         
+        /*
         private function rebuildIndex()
         {
                 foreach($this->rows as $id => $row)
@@ -449 +454 @@
                 }
                 $this->indexNotUpToDate = false;
         }
-
+         */
         /**
          * Returns the ith row in the array
          *
@@ -496 +501 @@
          */
         public function addRow( Piwik_DataTable_Row $row )
         {
-                $this->rows[] = $row;
-                if(!$this->indexNotUpToDate
-                        && $this->rebuildIndexContinuously)
-                {
+                $this->rows[] = $row;           
+                //if(!$this->indexNotUpToDate
+                //      && $this->rebuildIndexContinuously)
+                //{
                         $label = $row->getColumn('label');
                         if($label !== false)
                         {
-                                $this->rowsIndexByLabel[$label] = count($this->rows)-1;
+                                //$this->rowsIndexByLabel[$label] = count($this->rows)-1;
+                                $this->rowsIndexByLabel[$label] = $this->nextRowId;
+                                $this->nextRowId++;
                         }
                         $this->indexNotUpToDate = false;
-                }
+                //}
         }
 
         /**
@@ -816 +823 @@
                 $rows1 = $table1->getRows();
                 $rows2 = $table2->getRows();
                 
-                $table1->rebuildIndex();
-                $table2->rebuildIndex();
+                //$table1->rebuildIndex();
+                //$table2->rebuildIndex();
                 
                 if($table1->getRowsCount() != $table2->getRowsCount())
                 {