Revert "Lazy search execution"

This reverts commit 95a8e37.

Author: annda

_test/mock/AggregationEditorTable.php

@@ -8,7 +8,6 @@ class AggregationEditorTable extends meta\AggregationEditorTable
 {
     public function getResult()
     {
-        $this->executeSearch();
         return $this->result;
     }
 }

_test/mock/AggregationTable.php

@@ -8,7 +8,6 @@ class AggregationTable extends meta\AggregationTable
 {
     public function getResult()
     {
-        $this->executeSearch();
         return $this->result;
     }
 }

action/aggregationeditor.php

@@ -144,7 +144,6 @@ protected function saveRow()
             new SearchConfig($config)
         );
 
-        $editorTable->executeSearch();
         echo $editorTable->getFirstRow();
     }
 

meta/Aggregation.php

@@ -60,7 +60,10 @@ public function __construct($id, $mode, \Doku_Renderer $renderer, SearchConfig $
         $this->mode = $mode;
         $this->renderer = $renderer;
         $this->searchConfig = $searchConfig;
-        $this->data = $this->searchConfig->getConf();
+        $this->data = $searchConfig->getConf();
+        $this->columns = $searchConfig->getColumns();
+        $this->result = $this->searchConfig->execute();
+        $this->resultCount = $this->searchConfig->getCount();
         $this->helper = plugin_load('helper', 'struct_config');
     }
 
@@ -101,15 +104,6 @@ public function getScopeClasses()
         return $classes;
     }
 
-    public function executeSearch()
-    {
-        $this->columns = $this->searchConfig->getColumns();
-        $this->result = $this->searchConfig->execute();
-        $this->resultCount = $this->searchConfig->getCount();
-
-        $this->postSearch();
-    }
-
     /**
      * Render the actual output to the renderer
      *
@@ -126,9 +120,6 @@ abstract public function render($showNotFound = false);
      */
     public function startScope()
     {
-        if ($this->mode !== 'metadata') {
-            $this->executeSearch();
-        }
         if ($this->mode == 'xhtml') {
             $classes = $this->getScopeClasses();
 
@@ -139,16 +130,6 @@ public function startScope()
         }
     }
 
-    /**
-     * Child classes can set their own class properties based on search result
-     *
-     * @return void
-     */
-    public function postSearch()
-    {
-        return;
-    }
-
     /**
      * Closes anything opened in startScope()
      *

meta/AggregationCloud.php

@@ -20,8 +20,10 @@ class AggregationCloud extends Aggregation
      * @see render() on the resulting object.
      *
      */
-    public function postSearch()
+    public function __construct($id, $mode, \Doku_Renderer $renderer, SearchCloud $searchConfig)
     {
+        parent::__construct($id, $mode, $renderer, $searchConfig);
+
         $this->max = $this->result[0]['count'];
         $this->min = end($this->result)['count'];
     }

meta/AggregationEditorTable.php

@@ -27,7 +27,9 @@ public function render($showNotFound = false)
      */
     public function startScope()
     {
-        parent::startScope();
+        // unique identifier for this aggregation
+        $hash = md5(var_export($this->data, true));
+        $this->renderer->info['struct_table_hash'] = $hash;
 
         if ($this->mode != 'xhtml') return;
 

meta/AggregationList.php

@@ -12,17 +12,10 @@ class AggregationList extends Aggregation
     /** @var int number of all results */
     protected $resultColumnCount;
 
-    /**
-     * Set our class property after search has been executed in parent
-     * @return void
-     */
-    public function startScope()
-    {
-        parent::startScope();
-    }
-
-    public function postSearch()
+    /** @inheritdoc */
+    public function __construct($id, $mode, \Doku_Renderer $renderer, SearchConfig $searchConfig)
     {
+        parent::__construct($id, $mode, $renderer, $searchConfig);
         $this->resultColumnCount = count($this->columns);
     }
 

meta/AggregationTable.php

@@ -19,9 +19,18 @@ class AggregationTable extends Aggregation
     protected $resultRids;
     protected $resultRevs;
 
+    public function __construct($id, $mode, \Doku_Renderer $renderer, SearchConfig $searchConfig)
+    {
+        parent::__construct($id, $mode, $renderer, $searchConfig);
+        $this->resultPIDs = $this->searchConfig->getPids();
+        $this->resultRids = $this->searchConfig->getRids();
+        $this->resultRevs = $this->searchConfig->getRevs();
+    }
+
     /** @inheritdoc */
     public function render($showNotFound = false)
     {
+
         // abort early if there are no results at all (not filtered)
         if (!$this->resultCount && !$this->isDynamicallyFiltered() && $showNotFound) {
             $this->renderer->cdata($this->helper->getLang('none'));
@@ -95,13 +104,6 @@ public function startScope()
         parent::startScope();
     }
 
-    public function postSearch()
-    {
-        $this->resultPIDs = $this->searchConfig->getPids();
-        $this->resultRids = $this->searchConfig->getRids();
-        $this->resultRevs = $this->searchConfig->getRevs();
-    }
-
     /**
      * Closes the table and anything opened in startScope()
      *

syntax/table.php

@@ -122,13 +122,13 @@ public function render($format, Doku_Renderer $renderer, $config)
                 throw new StructException('Aggregation class does not inherit Aggregation: ' . $this->tableclass);
             }
 
+            $table->startScope();
+            $table->render(true);
+            $table->finishScope();
+
             if ($format === 'metadata') {
                 /** @var Doku_Renderer_metadata $renderer */
                 $renderer->meta['plugin']['struct']['hasaggregation'] = $search->getCacheFlag();
-            } else {
-                $table->startScope();
-                $table->render(true);
-                $table->finishScope();
             }
         } catch (StructException $e) {
             msg($e->getMessage(), -1, $e->getLine(), $e->getFile());