X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=b9f40fa65476b01527c70577a9b79893124a9035;hp=de0c7d88443a68397395c1838d609cb3d05622a6;hb=7a41f3cbb6640f18a4205ef367de6bf050020ed6;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308;ds=sidebyside

diff --git a/inc/database.php b/inc/database.php
index de0c7d88..b9f40fa6 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, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -29,15 +29,15 @@ $layerInstance = null;
 $cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s.php",
+$fqfn = sprintf("%sinc/database/lib-%s.php",
 	$cfg->readConfig('base_path'),
 	$cfg->readConfig('db_type')
 );
 
 // 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_once($fqfn);
 } else {
 	// Layer is missing!
 	ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
@@ -46,47 +46,14 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 }
 
 // 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()
-	));
-}
+$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
 
 // Is the app variable there and valid?
+// @TODO Rewrite this
 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)
-	));
-}
-
 // [EOF]
 ?>