Fixed more generic array handling #2

[core.git] / inc / classes / main / criteria / class_BaseCriteria.php

diff --git a/inc/classes/main/criteria/class_BaseCriteria.php b/inc/classes/main/criteria/class_BaseCriteria.php
index cbf192d36e31d567475985f926681e1978eacda4..78a4e828a110545be024e77829791ead0633dfbc 100644 (file)
--- a/inc/classes/main/criteria/class_BaseCriteria.php
+++ b/inc/classes/main/criteria/class_BaseCriteria.php
@@ -27,18 +27,6 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        private $wrapperConfigEntry = '';
 
-       /**
-        * Criteria to handle
-        */
-       private $criteria = array(
-               // Default
-               'default' => array(),
-               // Choice
-               'choice'  => array(),
-               // .. and exclude
-               'exclude' => array(),
-       );
-
        /**
         * Protected constructor
         *
@@ -48,6 +36,12 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
+
+               // Initialize all criteria arrays
+               foreach (array('default', 'choice', 'exclude') as $criteriaType) {
+                       // Init it
+                       $this->initGenericArrayKey('criteria', $criteriaType, 'entries');
+               } // END - foreach
        }
 
        /**
@@ -62,7 +56,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE));
 
                // Determine it
-               $isSet = isset($this->criteria[$criteriaType][$criteriaKey]);
+               $isSet = $this->isGenericArrayElementSet('criteria', $criteriaType, 'entries', $criteriaKey);
 
                // Return it
                return $isSet;
@@ -116,7 +110,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         * @return      $criteria
         */
        public final function getCriteriaArray ($criteriaType = 'default') {
-               return $this->criteria[$criteriaType];
+               return $this->getGenericArrayKey('criteria', $criteriaType, 'entries');
        }
 
        /**
@@ -151,9 +145,9 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
 
                // "Walk" through all criterias
-               foreach ($this->criteria as $criteriaType => $dummy) {
+               foreach ($this->getGenericArray('criteria') as $criteriaType => $dummy) {
                        // Remove it
-                       unset($this->criteria[$criteriaType][$criteriaKey]);
+                       $this->unsetGenericArrayElement('criteria', $criteriaType, 'entries', $criteriaKey);
                } // END - foreach
        }
 
@@ -176,14 +170,8 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($criteriaType) . '(' . $this->__toString() . ')-CRITERIA[' . __LINE__ . ']: criteriaKey=' . $criteriaKey . ',criteriaValue=' . $criteriaValue);
 
-               // Is it already there?
-               if ($this->isKeySet($criteriaType, $criteriaKey)) {
-                       // Append it
-                       $this->criteria[$criteriaType][$criteriaKey] .= ',' . (string) $criteriaValue;
-               } else {
-                       // Add it
-                       $this->criteria[$criteriaType][$criteriaKey] = (string) $criteriaValue;
-               }
+               // Append it
+               $this->appendStringToGenericArrayElement('criteria', $criteriaType, $criteriaKey, $criteriaValue);
        }
 
        /**
@@ -202,7 +190,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($criteriaType) . '(' . $this->__toString() . ')-CRITERIA[' . __LINE__ . ']: criteriaKey=' . $criteriaKey . ',criteriaValue=' . $criteriaValue);
 
                // Add it
-               array_push($this->criteria['choice'][$this->convertDashesToUnderscores($criteriaKey)], (string) $criteriaValue);
+               $this->pushValueToGenericArrayElement('criteria', 'choice', $this->convertDashesToUnderscores($criteriaKey), (string) $criteriaValue);
        }
 
        /**
@@ -247,7 +235,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
 
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($criteriaType) . '-CRITERIA[' . __LINE__ . ']: criteriaKey=' . $criteriaKey . ',criteria()=' . count($this->criteria[$criteriaType]));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($criteriaType) . '-CRITERIA[' . __LINE__ . ']: criteriaKey=' . $criteriaKey . ',criteria()=' . $this->countGenericArrayGroup('criteria', $criteriaType)));
 
                // Default is not found
                $value = FALSE;
@@ -255,7 +243,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                // Is the criteria there?
                if ($this->isKeySet($criteriaType, $criteriaKey)) {
                        // Then use it
-                       $value = $this->criteria[$criteriaType][$criteriaKey];
+                       $value = $this->getGenericArrayKey('criteria', $criteriaType, $criteriaKey);
                } // END - if
 
                // Return the value
@@ -305,7 +293,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                        $key = $this->convertDashesToUnderscores($key);
 
                        // Then walk through all search criteria
-                       foreach ($this->criteria[$criteriaType] as $criteriaKey => $criteriaValue) {
+                       foreach ($this->getGenericArrayKey('criteria', $criteriaType, 'entries') as $criteriaKey => $criteriaValue) {
                                // Make sure no 'my-' or 'my_' passes this point
                                assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE) && (!is_bool($criteriaValue)));
 
@@ -321,7 +309,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                } // END - foreach
 
                // Now check if expected criteria counts match
-               $matches = ($counted == count($this->criteria[$criteriaType]));
+               $matches = ($counted == $this->countGenericArrayGroup('criteria', $criteriaType));
 
                // Return the result
                return $matches;
@@ -358,18 +346,19 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        public function getCacheKey ($onlyKeys = array(), $criteriaType = 'default') {
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . ': criteriaType=' . $criteriaType . ',count()=' . count($this->criteria));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($this->__toString() . ': criteriaType=' . $criteriaType . ',count()=' . $this->countGenericArray('criteria')));
 
                // Make sure the criteria is there
-               assert((isset($this->criteria[$criteriaType])) && (is_array($this->criteria[$criteriaType])));
+               assert($this->isValidGenericArrayGroup('criteria', $criteriaType));
 
                // Initialize the key
                $cacheKey = '';
 
                // Now walk through all criterias
-               foreach ($this->criteria[$criteriaType] as $criteriaKey => $criteriaValue) {
+               foreach ($this->getGenericArrayKey('criteria', $criteriaType, 'entries') as $criteriaKey => $criteriaValue) {
                        // Make sure no 'my-' or 'my_' passes this point
                        assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE) && (!is_bool($criteriaValue)));
+                       assert(!is_array($criteriaValue));
 
                        // Convert dashes to underscore
                        $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
@@ -434,7 +423,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        public final function count ($criteriaType = 'default') {
                // Return it
-               return count($this->criteria[$criteriaType]);
+               return $this->countGenericArrayGroup('criteria', $criteriaType);
        }
 
        /**