Continued:

[core.git] / framework / main / classes / database / frontend / class_BaseDatabaseFrontend.php

diff --git a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
index f85f4badd2dac3bdbe8951a619c901abd7e91ff1..455213ec393fcfba4a27a87b25ab50f967e241ea 100644 (file)
--- a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
+++ b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
@@ -67,7 +67,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
                        // Set the new instance
                        $this->setCacheInstance(ObjectFactory::createObjectByConfiguredName('cache_class'));
-               } // END - if
+               }
        }
 
        /**
@@ -126,7 +126,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-               } // END - if
+               }
 
                // Does this key exists in cache?
                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -134,7 +134,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // Purge the cache
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Calling this->cacheInstance->purgeOffset(%s) ...', $cacheKey));
                        $this->getCacheInstance()->purgeOffset($cacheKey);
-               } // END - if
+               }
 
                // Handle it over to the middleware
                FrameworkBootstrap::getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
@@ -159,13 +159,13 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-               } // END - if
+               }
 
                // Does this key exists in cache?
                if ((FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) && ($this->getCacheInstance()->offsetExists($cacheKey))) {
                        // Purge the cache
                        $this->getCacheInstance()->purgeOffset($cacheKey);
-               } // END - if
+               }
 
                // Handle it over to the middleware
                FrameworkBootstrap::getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);
@@ -207,7 +207,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($criteriaInstance, $onlyKeys);
-               } // END - if
+               }
 
                // Does this key exists in cache?
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -228,7 +228,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                                        // A valid result has returned from the database layer
                                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Setting cacheKey=%s with result()=%d entries', $cacheKey, count($result)));
                                        $this->getCacheInstance()->offsetSet($cacheKey, $result);
-                               } // END - if
+                               }
                        } else {
                                // This invalid result must be wrapped
                                $result = array(
@@ -269,7 +269,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 
                        // Debug message
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: numRows=' . $numRows);
-               } // END - if
+               }
 
                // Return the result
                return $numRows;