Continued:

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

diff --git a/framework/main/classes/reader/class_ConsoleNewsReader.php b/framework/main/classes/reader/class_ConsoleNewsReader.php
index 31e47ef92ec523218a18e1d5602bdc43aacb9d3b..8280d08d8c08205a955a015137e0df9e0ca3810a 100644 (file)
--- a/framework/main/classes/reader/class_ConsoleNewsReader.php
+++ b/framework/main/classes/reader/class_ConsoleNewsReader.php
@@ -4,23 +4,20 @@ namespace Org\Mxchange\CoreFramework\Reader\News\Console;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Reader\News\ReadableNews;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Traits\Result\Search\SearchableResultTrait;
 
 /**
  * A console news reader class reads news from database layer
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/reader/class_ConsoleNewsReader.php
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/reader/class_ConsoleNewsReader.php
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -38,6 +35,9 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Registerable {
+       // Load traits
+       use SearchableResultTrait;
+
        /**
         * Protected constructor
         *
@@ -72,8 +72,8 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
                // Get 'command' for saving some calls
                $command = FrameworkBootstrap::getRequestInstance()->getRequestElement('command');
 
-               // First get a wrapper instance
-               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('news_db_wrapper_class');
+               // First get a frontend instance
+               $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('news_db_frontend_class');
 
                // Next create a searchable criteria instance
                $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
@@ -85,7 +85,7 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
                $criteriaInstance->setConfiguredLimit('news_' . $command . '_limit');
 
                // Get a resultInstance back from the database
-               $resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
+               $resultInstance = $frontendInstance->doSelectByCriteria($criteriaInstance);
 
                // Save that resultInstance in this class
                $this->setResultInstance($resultInstance);