Changeset 1811

Timestamp:

03/01/07 19:28:41 (23 months ago)

Author:

david

Message:

ability to prevent sending of the response in Controller::dispatch() which now also returns the final response (not the global one, mind you, but that one gets merged in) via parameter 'send_response'. plus some small refactorings. closes #469

Files:

• branches/0.11/src/controller/AgaviController.class.php (modified) (6 diffs)

branches/0.11/src/controller/AgaviController.class.php

@@ -30 +30 @@
  * @version    $Id$
  */
-class AgaviController
+class AgaviController extends AgaviParameterHolder
 {
   /**
@@ -36 +36 @@
    */
   protected $numExecutions = 0;
-  
-  /**
-   * @var        int The maximum number of execution container runs allowed.
-   */
-  protected $maxExecutions = 20;
   
   /**
@@ -109 +104 @@
   public function countExecution()
   {
-    if(++$this->numExecutions > $this->maxExecutions && $this->maxExecutions > 0) {
+    $maxExecutions = $this->getParameter('max_executions');
+    
+    if(++$this->numExecutions > $maxExecutions && $maxExecutions > 0) {
       throw new AgaviControllerException('Too many execution runs have been detected for this Context.');
     }
@@ -190 +187 @@
       $response = $container->getResponse();
       $response->merge($this->response);
-      $response->send($container->getOutputType());
+      
+      if($this->getParameter('send_response')) {
+        $response->send($container->getOutputType());
+      }
+      
+      return $response;
       
     } catch(Exception $e) {
@@ -326 +328 @@
 
   /**
+   * Constructor.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function __construct()
+  {
+    parent::__construct();
+    $this->setParameters(array(
+      'max_executions' => 20,
+      'send_response' => true,
+    ));
+  }
+  
+  /**
    * Initialize this controller.
    *
@@ -337 +354 @@
   {
     $this->context = $context;
+    
+    $this->setParameters($parameters);
     
     $rfi = $context->getFactoryInfo('response');
     $this->response = new $rfi["class"](); 
     $this->response->initialize($context, $rfi["parameters"]);
-    
-    $this->maxExecutions = isset($parameters['max_executions']) ? $parameters['max_executions'] : 20;
     
     $cfg = AgaviConfig::get('core.config_dir') . '/output_types.xml';