Used more DatabaseWrapperFactory as one instance of each is fine.

[core.git] / inc / classes / main / reader / class_ConsoleNewsReader.php

diff --git a/inc/classes/main/reader/class_ConsoleNewsReader.php b/inc/classes/main/reader/class_ConsoleNewsReader.php
index e954686adb4eab0fad7c1e3a599204c67e969dff..1aa4b61543c7361b819ce14d92b60db6074dbb45 100644 (file)
--- a/inc/classes/main/reader/class_ConsoleNewsReader.php
+++ b/inc/classes/main/reader/class_ConsoleNewsReader.php
@@ -2,11 +2,11 @@
 /**
  * A console news reader class reads news from database layer
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,10 +30,6 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -42,7 +38,7 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
         * @param       $requestInstance        An instance of a Requestable class
         * @return      $readerInstance         An instance of this reader class
         */
-       public final static function createConsoleNewsReader (Requestable $requestInstance) {
+       public static final function createConsoleNewsReader (Requestable $requestInstance) {
                // Get a new instance
                $readerInstance = new ConsoleNewsReader();
 
@@ -64,16 +60,16 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
                $command = $this->getRequestInstance()->getRequestElement('command');
 
                // First get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('news_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('news_db_wrapper_class');
 
                // Next create a searchable criteria instance
                $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Add the command as criteria to it at lease
-               $criteriaInstance->addCriteria('page', $command);
+               $criteriaInstance->addCriteria('command', $command);
 
                // Add limitation from config
-               $criteriaInstance->setLimit($this->getConfigInstance()->readConfig('news_' . $command . '_limit'));
+               $criteriaInstance->setConfiguredLimit('news_' . $command . '_limit');
 
                // Get a resultInstance back from the database
                $resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);