X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=84b6d63ba7a7971ecd8a6487d00f8c35f6852a6b;hp=7106d5c72e83b63efacd25376c395aca26b254f3;hb=416a2ea08a1dd3dafc7d875be6348c2d7fdf4cc4;hpb=18fd6edc11a36a3e52870f1946499e448a863ea7

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index 7106d5c7..84b6d63b 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 - 2011 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?
@@ -74,7 +79,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	}
 
 	/**
-	 * Getter for whole instanceregistry
+	 * Getter for whole instance registry
 	 *
 	 * @return	$instanceRegistry	The whole instance registry array
 	 */
@@ -100,7 +105,7 @@ 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;
 
@@ -126,12 +131,21 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 
 		// "Walk" over all entries
 		foreach ($this->getEntries('object-name') as $key=>$value) {
+			// Debug message
+			//* DEBUG: */ $this->debugOutput('REGISTRY: 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) {
+					// Debug message
+					//* DEBUG: */ $this->debugOutput('REGISTRY: 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: */ $this->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+
 						// Then add it
 						$entry[$key2] = $value2[$key];
 					} // END - if
@@ -155,7 +169,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function getInstance ($instanceKey) {
 		// By default the instance is not in registry
-		$objectInstance = null;
+		$objectInstance = NULL;
 
 		// Is the instance there?
 		if ($this->instanceExists($instanceKey)) {
@@ -171,6 +185,23 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		// 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]