X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=c9a80904baad799108992aeef521eaabe8279feb;hp=ca01a2a2a75abcbb479361fea5b5593e5d47c9a2;hb=f5cf5211620c1813c76d8231819b63a585fb2689;hpb=fffe0ef5a4c39831127b1afed64d8ea0e077b09e

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index ca01a2a2..c9a80904 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,10 +22,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseRegistry extends BaseFrameworkSystem implements Registerable {
+	/**
+	 * Glue for generating a registry key
+	 */
+	const REGISTRY_KEY_GLUE = '_';
+
 	/**
 	 * Instance of this class
 	 */
-	private static $registryInstance = null;
+	private static $registryInstance = NULL;
 
 	/**
 	 * Instance registry
@@ -49,10 +54,10 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	}
 
 	/**
-	 * Checks wether an instance key was found
+	 * Checks whether an instance key was found
 	 *
 	 * @param	$instanceKey	The key holding an instance in registry
-	 * @return	$exists			Wether the key exists in registry
+	 * @return	$exists			Whether the key exists in registry
 	 */
 	public function instanceExists ($instanceKey) {
 		// Does this key exists?
@@ -73,6 +78,15 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		$this->instanceRegistry[$instanceKey] = $objectInstance;
 	}
 
+	/**
+	 * Getter for whole instance registry
+	 *
+	 * @return	$instanceRegistry	The whole instance registry array
+	 */
+	public final function getInstanceRegistry () {
+		return $this->instanceRegistry;
+	}
+
 	/**
 	 * Adds a new entry to the given list name. If you want to add objects
 	 * please use addInstance() and getInstance() instead.
@@ -82,8 +96,14 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	public final function addEntry ($key, $value) {
+		// Is the array there?
+		if (!isset($this->rawEntries[$key])) {
+			// Then intialize it here
+			$this->rawEntries[$key] = array();
+		} // END - if
+
 		// Simply add it
-		$this->rawEntries[$key][] = $value;
+		array_push($this->rawEntries[$key], $value);
 	}
 
 	/**
@@ -91,12 +111,12 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 *
 	 * @return	$entries	An array with entries from this registry
 	 */
-	public final function getEntries ($key = null) {
+	public final function getEntries ($key = NULL) {
 		// Default is whole array
 		$entries = $this->rawEntries;
 
 		// Is $key set?
-		if (!is_null($key)) {
+		if ((!is_null($key)) && (isset($this->rawEntries[$key]))) {
 			// Then use this entry
 			$entries = $this->rawEntries[$key];
 		} // END - if
@@ -108,21 +128,31 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	/**
 	 * "Getter" for an array of all entries for given key
 	 *
+	 * @param	$arrayKey	The array (key) to look in
 	 * @param	$lookFor	The key to look for
 	 * @return	$entry		An array with all keys
 	 */
-	public function getArrayFromKey ($lookFor) {
+	public function getArrayFromKey ($arrayKey, $lookFor) {
 		// Init array
 		$entry = array();
 
 		// "Walk" over all entries
-		foreach ($this->getEntries('object-name') as $key=>$value) {
+		foreach ($this->getEntries($arrayKey) as $key => $value) {
+			// Debug message
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+
 			// If $value matches the $lookFor, we need to look for more entries for this!
 			if ($lookFor == $value) {
 				// Look for more entries
-				foreach ($this->getEntries() as $key2=>$value2) {
+				foreach ($this->getEntries() as $key2 => $value2) {
+					// Debug message
+					//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
+
 					// Both keys must match!
-					if ($key == $key2) {
+					if (($key == $key2) || (isset($value2[$key]))) {
+						// Debug message
+						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
+
 						// Then add it
 						$entry[$key2] = $value2[$key];
 					} // END - if
@@ -145,23 +175,35 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @throws	NullPointerException	If the requested key is not found
 	 */
 	public function getInstance ($instanceKey) {
-		// By default the instance is not in registry
-		$objectInstance = null;
-
 		// Is the instance there?
-		if ($this->instanceExists($instanceKey)) {
-			$objectInstance = $this->instanceRegistry[$instanceKey];
-		} // END - if
-
-		// Still not fetched?
-		if (is_null($objectInstance)) {
+		if (!$this->instanceExists($instanceKey)) {
 			// This might happen if a non-registered key was requested
 			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
 		} // END - if
 
+		// Get the instance
+		$objectInstance = $this->instanceRegistry[$instanceKey];
+
 		// Return the result
 		return $objectInstance;
 	}
+
+	/**
+	 * "Getter" for a registry key for given prefix and array. This method
+	 * calls implode() to get a suitable key. This method does not care about
+	 * the indexes.
+	 *
+	 * @param	$prefix			Prefix for the key
+	 * @param	$data			An array with data
+	 * @return	$registryKey	A registry key
+	 */
+	public static function getRegistryKeyFromArray ($prefix, array $data) {
+		// "Generate" the key
+		$registryKey = $prefix . self::REGISTRY_KEY_GLUE . implode(self::REGISTRY_KEY_GLUE, $data);
+
+		// Return it
+		return $registryKey;
+	}
 }
 
 // [EOF]