MINOR: Missing empty line

[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 4b77b8f1e7ba8fbb6c8bd455287d549a5fa66dd3..21b53aa13e078b6ff69c50ae1e0f2730cb439c94 100644 (file)
--- a/inc/classes/main/criteria/class_BaseCriteria.php
+++ b/inc/classes/main/criteria/class_BaseCriteria.php
@@ -31,6 +31,7 @@ class BaseCriteria extends BaseFrameworkSystem {
         * Criteria to handle
         */
        private $criteria = array();
+
        /**
         * Protected constructor
         *
@@ -79,7 +80,12 @@ class BaseCriteria extends BaseFrameworkSystem {
         * @return      void
         */
        public final function addCriteria ($criteriaKey, $criteriaValue) {
-               $this->criteria[str_replace('-', '_', $criteriaKey)] = (string)$criteriaValue;
+               // Debug message
+               if (strpos($criteriaKey, 'my-') !== false) $this->debugBackTrace('criteriaKey=' . $criteriaKey);
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CRITERIA: criteriaKey=' . $criteriaKey . ',criteriaValue=' . $criteriaValue);
+
+               // Add it
+               $this->criteria[$this->convertDashesToUnderscores($criteriaKey)] = (string)$criteriaValue;
        }
 
        /**
@@ -103,7 +109,10 @@ class BaseCriteria extends BaseFrameworkSystem {
         */
        public function getCriteriaElemnent ($criteriaKey) {
                // Convert dashes to underscore
-               $criteriaKey = str_replace('-', '_', $criteriaKey);
+               $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CRITERIA: criteriaKey=' . $criteriaKey . ',criteria()=' . count($this->criteria));
 
                // Default is not found
                $value = NULL;
@@ -112,7 +121,7 @@ class BaseCriteria extends BaseFrameworkSystem {
                if (isset($this->criteria[$criteriaKey])) {
                        // Then use it
                        $value = $this->criteria[$criteriaKey];
-               }
+               } // END - if
 
                // Return the value
                return $value;
@@ -132,12 +141,12 @@ class BaseCriteria extends BaseFrameworkSystem {
                // Walk through all entries
                foreach ($entryArray as $key => $entry) {
                        // Convert dashes to underscore
-                       $key = str_replace('-', '_', $key);
+                       $key = $this->convertDashesToUnderscores($key);
 
                        // Then walk through all search criteria
                        foreach ($this->criteria as $criteriaKey => $criteriaValue) {
                                // Convert dashes to underscore
-                               $criteriaKey = str_replace('-', '_', $criteriaKey);
+                               $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
 
                                // Is the element found and does it match?
                                if (($key == $criteriaKey) && ($criteriaValue == $entry)) {
@@ -167,7 +176,7 @@ class BaseCriteria extends BaseFrameworkSystem {
                // Now walk through all criterias
                foreach ($this->criteria as $criteriaKey => $criteriaValue) {
                        // Convert dashes to underscore
-                       $criteriaKey = str_replace('-', '_', $criteriaKey);
+                       $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
 
                        // Is the value in array or is $onlyKeys empty?
                        if ((isset($onlyKeys[$criteriaKey])) || (count($onlyKeys) == 0)) {
@@ -197,6 +206,16 @@ class BaseCriteria extends BaseFrameworkSystem {
                // Return the cache key
                return $cacheKey;
        }
+
+       /**
+        * Count the criteria, e.g. useful to find out if a database query has no limitation (search criteria)
+        *
+        * @return      $count  Count of all criteria entries
+        */
+       public final function count () {
+               // Return it
+               return count($this->criteria);
+       }
 }
 
 // [EOF]