Following things are changed: (in order of class names)

[shipsimu.git] / inc / classes / main / database / wrapper / class_NewsDatabaseWrapper.php

diff --git a/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
index 09574b1857ab380d28f225086e940ad837aa9cac..73b7a21938105fe5a1c389a15eda197123603e09 100644 (file)
--- a/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
@@ -22,16 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class NewsDatabaseWrapper extends BaseDatabaseWrapper {
-       /**
-        * Cache instance
-        */
-       private $cacheInstance = null;
-
-       // Constants for exceptions
-       const EXCEPTION_CLIENT_USERNAME_NOT_FOUND = 0x160;
-
-       // Constants for database columns
-
        // Constants for database table names
        const DB_TABLE_NEWS = "news";
 
@@ -60,64 +50,12 @@ class NewsDatabaseWrapper extends BaseDatabaseWrapper {
                // Get a new instance
                $wrapperInstance = new NewsDatabaseWrapper();
 
-               // Initialize the cache instance
-               $wrapperInstance->initCacheInstance();
+               // Set (primary!) table name
+               $wrapperInstance->setTableName(self::DB_TABLE_NEWS);
 
                // Return the instance
                return $wrapperInstance;
        }
-
-       /**
-        * Initializes the cache instance with a new object
-        *
-        * @return      void
-        */
-       protected function initCacheInstance () {
-               // Set the new instance
-               $this->cacheInstance = CacheFactory::getFactory()->createConfiguredCache();
-       }
-
-       /**
-        * Do a "select" query on the user table with the given search criteria and
-        * store it in cache for later usage
-        *
-        * @param       $criteriaInstance       An instance of a Criteria class
-        * @return      $resultInstance         An instance of a database result class
-        */
-       public function doSelectByCriteria (Criteria $criteriaInstance) {
-               // First get a key suitable for our cache and extend it with this class name
-               $cacheKey = sprintf("%s@%s",
-                       $this->__toString(),
-                       $criteriaInstance->getCacheKey()
-               );
-
-               // Does this key exists in cache?
-               if ($this->cacheInstance->offsetExists($cacheKey)) {
-                       // Then use this result
-                       $result = $cacheInstance->offsetGet($cacheKey);
-               } else {
-                       // Now it's time to ask the database layer for this select statement
-                       $result = $this->getDatabaseInstance()->doSelectByTableCriteria(self::DB_TABLE_NEWS, $criteriaInstance);
-
-                       // Cache the result if not null
-                       if (!is_null($result)) {
-                               // A valid result has returned from the database layer
-                               $this->cacheInstance->offsetSet($cacheKey, $result);
-                       } else {
-                               // This invalid result must be wrapped
-                               $result = array(
-                                       'status'                => "invalid",
-                                       'exception'             => $this->getDatabaseInstance()->getLastException()
-                               );
-                       }
-               }
-
-               // Create an instance of a DatabaseResult class with the given result
-               $resultInstance = DatabaseResult::createDatabaseResult($result);
-
-               // And return the instance
-               return $resultInstance;
-       }
 }
 
 // [EOF]