X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=03bc377ac5d781427711d319ddd2a873b9f8202a;hp=8dd90e46da5f2d9169f3d3280612742550664ff9;hb=8ff12f905898b0c2b7ff8124c9749ad6fb9c44f3;hpb=55b327a3f5f2fe1d244532e07be7444e94b2a768 diff --git a/inc/database.php b/inc/database.php index 8dd90e4..03bc377 100644 --- a/inc/database.php +++ b/inc/database.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright(c) 2007, 2008 Roland Haeder, this is free software + * @copyright Copyright (c) 2007, 2008 Roland Haeder, this is free software * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -23,21 +23,16 @@ */ // Initialize layer -$layer = null; +$layerInstance = null; -// Is the type defined? -if (!defined('_DB_TYPE')) { - // Abort here - ApplicationEntryPoint::app_die("[Main:] Please define a database type first!
-E.g.:
$GLOBALS['cfg']->defineDatabaseType("local");
-This will choose the local-file-based database type (layer)"); -} +// Get config instance +$cfg = FrameworkConfiguration::getInstance(); // Generate FQFN for the database layer $INC = sprintf("%sinc/database/lib-%s%s", - PATH, - _DB_TYPE, - FrameworkConfiguration::getInstance()->readConfig('php_extension') + $cfg->readConfig('base_path'), + $cfg->readConfig('db_type'), + $cfg->readConfig('php_extension') ); // Load the database layer include @@ -47,7 +42,7 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) { } else { // Layer is missing! ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.", - _DB_TYPE + $cfg->readConfig('db_type') )); } @@ -56,7 +51,7 @@ unset($INC); // Prepare database instance try { - $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layer); + $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance); } catch (NullPointerException $e) { ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: %s
\n", $e->getMessage()