X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=application%2Fhub%2Fclass_ApplicationHelper.php;h=053a4b1113452576ea58b9fe55040df4de6215b9;hb=aa4ac5d61eab8540e9902396998f3f53718eeaf5;hp=96d955ace9315cd7489548917999b0968d215dce;hpb=87182026c240081921f6f4a75a36a02baf70c9bd;p=hub.git

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 96d955ace..053a4b111 100644
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -22,7 +22,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007 - 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright	Copyright (c) 2007 - 2008 Roland Haeder, 2009, 2010 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -67,10 +67,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Tidy up a little
-		$this->removeSystemArray();
-		$this->removeNumberFormaters();
 	}
 
 	/**
@@ -178,7 +174,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		$this->setResponseInstance($responseInstance);
 
 		// Get the parameter from the request
-		$commandName = $requestInstance->getRequestElement('page');
+		$commandName = $requestInstance->getRequestElement('command');
 
 		// If it is null then get default command
 		if (is_null($commandName)) {
@@ -190,86 +186,27 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		} // END - if
 
 		// Get a resolver
-		$resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+		$resolverClass = sprintf("Hub%sControllerResolver", $this->convertToClassName($responseType));
 		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
-		$this->controllerInstance = $resolverInstance->resolveController();
-
-		// Handle the request
-		$this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-		// ----------------------------- Init phase ---------------------------
-
-		// The default node-mode is from our configuration
-		$nodeMode = $this->getConfigInstance()->readConfig('node_mode');
-		die("Until here!\n");
-
-		// Prepare a ConsoleRequest class to catch all parameters
-		$requestInstance = ObjectFactory::createObjectByName('ConsoleRequest');
-
-		// Is the node 'mode' parameter set?
-		if ($requestInstance->isRequestElementSet('mode')) {
-			// Then use this which overrides the config entry temporarily
-			$nodeMode = $requestInstance->getRequestElement('mode');
-		} else {
-			// Set it for easier re-usage
-			$requestInstance->setRequestElement('mode', $nodeMode);
-		}
-
-		// Now convert the node-mode in a class name
-		$className = 'Hub' . $this->convertToClassName($nodeMode) . 'Node';
-
-		// And try to instance it
-		try {
-			// Get an instance
-			$nodeInstance = ObjectFactory::createObjectByName($className, array($requestInstance));
-
-			// Set the app instance
-			$nodeInstance->setApplicationInstance($this);
-
-			// Initialize all filters
-			$nodeInstance->initializeFilters();
-		} catch (ClassNotFoundException $e) {
-			// This exception means, the node mode is invalid.
-			// @TODO Can we rewrite this to app_die() ?
-			die('Node mode ' . $nodeMode . ' is invalid.' . "\n");
-		}
-
-		// ----------------------- Output teaser lines ------------------------
-		// Output some introducing lines to the console. This should be later
-		// be switched off if this is a productive release because it would be
-		// only visible to the logfile.
-		$nodeInstance->outputConsoleTeaser();
-
-		// ----------------------- Bootstrapping phase ------------------------
-		// Try to bootstrap the node and pass the request instance to it for
-		// extra arguments which mostly override config entries or enable special
-		// features within the hub (none is ready at this development stage)
-		$this->debugOutput('BOOTSTRAP: Beginning with bootstrap...');
-		$nodeInstance->doBootstrapping();
-		$this->debugOutput('BOOTSTRAP: Bootstrap finished.');
+		$this->setControllerInstance($resolverInstance->resolveController());
 
-		// ----------------------- Init all query queues ----------------------
-		// After the bootstrap is done we need to initialize the queues which
-		// will help us to communicate between the "tasks" a hub needs to do.
-		$nodeInstance->initQueues();
+		// Get the registry
+		$registryInstance = Registry::getRegistry();
 
-		// -------------------------- Hub activation --------------------------
-		// Activates the hub by doing some final preparation steps and setting
-		// the attribute $hubIsActive to true
-		$nodeInstance->activateHub();
+		// Set this application
+		$registryInstance->addInstance('app', $this);
 
-		// ----------------------------- Main loop ----------------------------
-		// This is the main loop. Queried calls should come back here very fast
-		// so the whole application runs on nice speed. This while-loop goes
-		// until the hub is no longer active.
-		while ($nodeInstance->isHubActive()) {
-		} // END - while
+		// Launch the hub main routine here
+		$this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
 		// -------------------------- Shutdown phase --------------------------
 		// Shutting down the hub by saying "good bye" to all connected clients
 		// and other hubs, flushing all queues and caches.
-		$nodeInstance->doShutdown();
+		$this->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+		$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
+		$this->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
 	}
 
 	/**
@@ -282,7 +219,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public function handleFatalMessages (array $messageList) {
 		// Walk through all messages
 		foreach ($messageList as $message) {
-			die("MSG:" . $message);
+			die('MSG:' . $message);
 		}
 	}