X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=40d58f0bf888b3e80d42145c11e90d363c1b905b;hp=f62ab895e58ef6f5d93f924ab8821ead441e0fd6;hb=73bb9000fb82cfb51d3e55f0d1f7f6d09974368e;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae

diff --git a/inc/database.php b/inc/database.php
index f62ab895..40d58f0b 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,71 +22,32 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Initialize layer
-$layerInstance = null;
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
+// Initialize database layer
+$databaseInstance = null;
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s.php",
-	$cfg->readConfig('base_path'),
-	$cfg->readConfig('db_type')
-);
+$fqfn = FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->getConfigEntry('db_type') . '.php';
 
 // Load the database layer include
-if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
+if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
 	// Load the layer
-	require_once($INC);
+	require($fqfn);
 } else {
 	// Layer is missing!
 	ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-		$cfg->readConfig('db_type')
+		FrameworkConfiguration::getInstance()->getConfigEntry('db_type')
 	));
 }
 
 // Clean it up
-unset($INC);
+unset($fqfn);
 
 // Prepare database instance
-try {
-	$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
-} catch (NullPointerException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-} catch (InvalidDirectoryResourceException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-} catch (PathIsEmptyException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-} catch (PathIsNoDirectoryException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-} catch (PathReadProtectedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-} catch (DirPointerNotOpenedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-		$e->getMessage()
-	));
-}
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);
 
 // Is the app variable there and valid?
-if (is_object($app)) $app->setDatabaseInstance($db);
-
-// Datenbankobjekt debuggen
-if (defined('DEBUG_DATABASE_OBJ')) {
-	DebugMiddleware::getInstance()->output(sprintf("The database sub-system does now look like this:<br />
-<pre>%s</pre>\n",
-		print_r($db, true)
-	));
-}
+// @TODO Rewrite this
+if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
 
 // [EOF]
 ?>