Continued:
authorRoland Haeder <roland@mxchange.org>
Sat, 25 Feb 2017 15:58:18 +0000 (16:58 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 28 Feb 2017 21:10:04 +0000 (22:10 +0100)
- added missing config entry
- expanded config entry local_file_database_class with namespace
- need to load inc/database.php (which will later also be rewritten to an OOPed way)
- added "import" of FrameworkDatabase
- added "import" of BaseDatabaseBackend
- added "import" of DatabaseBackend
- added "import" of StoreableCriteria

Signed-off-by: Roland H├Ąder <roland@mxchange.org>
20 files changed:
application/tests/config.php
application/tests/init.php
inc/config.php
inc/main/classes/class_BaseFrameworkSystem.php
inc/main/classes/criteria/dataset/class_DataSetCriteria.php
inc/main/classes/criteria/search/class_SearchCriteria.php
inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
inc/main/classes/database/class_BaseDatabaseBackend.php
inc/main/classes/database/class_BaseDatabaseResult.php
inc/main/classes/database/class_BaseDatabaseWrapper.php
inc/main/classes/database/result/class_CachedDatabaseResult.php
inc/main/classes/handler/class_BaseHandler.php
inc/main/classes/points/class_UserPoints.php
inc/main/interfaces/criteria/extended/class_AddableCriteria.php
inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
inc/main/interfaces/database/backend/class_DatabaseBackend.php
inc/main/interfaces/database/middleware/class_DatabaseConnector.php
inc/main/interfaces/handler/class_HandleableDataSet.php
inc/main/interfaces/result/class_SearchableResult.php
inc/main/middleware/database/class_DatabaseConnection.php

index a4e6d86..dbe5aa7 100644 (file)
@@ -47,3 +47,6 @@ $cfg->setConfigEntry('news_process_filter', 'CoreFramework\Filter\News\NewsProce
 
 // CFG: NEWS-READER-MAIN-CLASS
 $cfg->setConfigEntry('news_reader_main_class', 'CoreFramework\Reader\News\Console\ConsoleNewsReader');
+
+// CFG: NEWS-MAIN-LIMIT
+$cfg->setConfigEntry('news_main_limit', 5);
index b877ada..00cf2f4 100644 (file)
@@ -30,3 +30,7 @@ ClassLoader::scanApplicationClasses();
 
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
+
+// This application needs a database connection then we have to simply include
+// the inc/database.php script
+require($cfg->getConfigEntry('base_path') . 'inc/database.php');
index 81f92ef..262c606 100644 (file)
@@ -338,7 +338,7 @@ $cfg->setConfigEntry('stacker_generic_max_size', 100);
 $cfg->setConfigEntry('stacker_current_node_max_size', 20);
 
 // CFG: LOCAL-FILE-DATABASE-CLASS
-$cfg->setConfigEntry('local_file_database_class', 'CachedLocalFileDatabase');
+$cfg->setConfigEntry('local_file_database_class', 'CoreFramework\Database\Backend\Lfdb\CachedLocalFileDatabase');
 
 // CFG: COMPRESSOR-CHANNEL-CLASS
 $cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');
index f6c51c5..fdf7aab 100644 (file)
@@ -6,6 +6,7 @@ namespace CoreFramework\Object;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
index aefa162..867e655 100644 (file)
@@ -4,6 +4,7 @@ namespace CoreFramework\Criteria\DataSet;
 
 // Import framework stuff
 use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 
 /**
  * A set of data storeable in databases
index 0f66599..58e0b5e 100644 (file)
@@ -4,6 +4,7 @@ namespace CoreFramework\Criteria\Search;
 
 // Import framework stuff
 use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if
index 3bdebd3..fac9b9e 100644 (file)
@@ -4,6 +4,10 @@ namespace CoreFramework\Database\Backend\Lfdb;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkException;
 
index c844647..fb3bab6 100644 (file)
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Backend;
 
 // Import framework stuff
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Generic\FrameworkException;
 use CoreFramework\Object\BaseFrameworkSystem;
 
index cba50e4..3d598db 100644 (file)
@@ -8,7 +8,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
 /**
  * A general class for database results
  *
- * @see                        DatabaseBackendInterface - An interface for database backends
+ * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
index 5a6faf6..66b1f79 100644 (file)
@@ -4,6 +4,8 @@ namespace CoreFramework\Database\Wrapper;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
index 4489c44..15293b6 100644 (file)
@@ -3,6 +3,9 @@
 namespace CoreFramework\Database\Result;
 
 // Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
 
 /**
index e0a0d00..945ebeb 100644 (file)
@@ -3,6 +3,7 @@
 namespace CoreFramework\Handler;
 
 // Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
index b3f836e..0961a48 100644 (file)
@@ -3,6 +3,7 @@
 namespace CoreFramework\User\Point;
 
 // Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
index ed6b6f4..fbc9fc4 100644 (file)
@@ -3,6 +3,7 @@
 namespace CoreFramework\Criteria;
 
 // Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Request\Requestable;
 
index 5515265..3fa2f97 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Criteria;
+namespace CoreFramework\Criteria\Storing;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
index 62e116c..1ddd916 100644 (file)
@@ -2,6 +2,11 @@
 // Own namespace
 namespace CoreFramework\Database\Backend;
 
+// Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\FrameworkDatabase;
+
 /**
  * An interface for front-end database classes. The classes should prepare the
  * objects for saving in the database. So for server-bases database classes SQL
index 36e7937..0491b70 100644 (file)
@@ -4,6 +4,9 @@ namespace CoreFramework\Connector\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\DatabaseBackend;
+use CoreFramework\Database\FrameworkDatabase;
 
 /**
  * An interface for middleware database classes
index f93933b..e443476 100644 (file)
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Handler\DataSet;
 
+// Import framework stuff
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+
 /**
  * An interface for data set handlers
  *
index 4bd1b76..611231f 100644 (file)
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Result;
 
 // Import framework stuff
+use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
index 2821d3a..7ef989b 100644 (file)
@@ -4,6 +4,8 @@ namespace CoreFramework\Connection\Database;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Backend\DatabaseBackend;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Middleware\BaseMiddleware;
 use CoreFramework\Middleware\Debug\DebugMiddleware;