Continued:

[core.git] / framework / main / classes / database / result / class_CachedDatabaseResult.php

diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 9c2586c974c5c222937514244de8a2b67e320b0f..6c36cdc04c6004f510e769dc7a7637c64386037f 100644 (file)
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -1,16 +1,15 @@
 <?php
 // Own namespace
-namespace CoreFramework\Result\Database;
+namespace Org\Mxchange\CoreFramework\Result\Database;
 
 // Import framework stuff
-use CoreFramework\Criteria\Local\LocalSearchCriteria;
-use CoreFramework\Criteria\Local\LocalUpdateCriteria;
-use CoreFramework\Criteria\Storing\StoreableCriteria;
-use CoreFramework\Database\Backend\BaseDatabaseBackend;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Result\Search\SearchableResult;
-use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
+use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
+use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Backend\BaseDatabaseBackend;
+use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
+use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
 
 // Import SPL stuff
 use \SeekableIterator;
@@ -140,14 +139,14 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
         */
        public function next () {
                // Default is not valid
-               $nextValid = FALSE;
+               $nextValid = false;
 
                // Is the result valid?
                if ($this->valid()) {
                        // Next entry found, so count one up and cache it
                        $this->currentPos++;
                        $this->currentRow = $this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][$this->currentPos];
-                       $nextValid = TRUE;
+                       $nextValid = true;
                } // END - if
 
                // Return the result
@@ -197,7 +196,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
         */
        public function valid () {
                // By default nothing is valid
-               $isValid = FALSE;
+               $isValid = false;
 
                // Debug message
                //*NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . '] this->currentPos=' . $this->currentPos);
@@ -205,7 +204,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                // Check if all is fine ...
                if (($this->ifStatusIsOkay()) && (isset($this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][($this->currentPos + 1)])) && (isset($this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][0]))) {
                        // All fine!
-                       $isValid = TRUE;
+                       $isValid = true;
                } // END - if
 
                // Return the result
@@ -350,10 +349,9 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
         * Adds registration elements to a given dataset instance
         *
         * @param       $criteriaInstance       An instance of a StoreableCriteria class
-        * @param       $requestInstance        An instance of a Requestable class
         * @return      void
         */
-       public function addElementsToDataSet (StoreableCriteria $criteriaInstance, Requestable $requestInstance = NULL) {
+       public function addElementsToDataSet (StoreableCriteria $criteriaInstance) {
                // Walk only through out-dated columns
                foreach ($this->outDated as $key => $dummy) {
                        // Does this key exist?
@@ -373,7 +371,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
         */
        public function find ($key) {
                // By default nothing is found
-               $found = FALSE;
+               $found = false;
 
                // Rewind the pointer
                $this->rewind();
@@ -389,7 +387,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                        // Is the element there?
                        if (isset($currentEntry[$key])) {
                                // Okay, found!
-                               $found = TRUE;
+                               $found = true;
 
                                // So "cache" it
                                $this->foundValue = $currentEntry[$key];