should be more encapsulated (abstracted)

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index 544a2a55dc3f51f4b487336b620d4953c8b05b0f..40d58f0bf888b3e80d42145c11e90d363c1b905b 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -22,38 +22,32 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
  * 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
 
 // 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
 
 // 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
        // 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.",
 } 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
        ));
 }
 
 // Clean it up

-unset($INC);
+unset($fqfn);

 
 // Prepare database instance
 
 // Prepare database instance

-$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);

 
 // Is the app variable there and valid?
 // @TODO Rewrite this
 
 // Is the app variable there and valid?
 // @TODO Rewrite this

-if (is_object($app)) $app->setDatabaseInstance($db);
+if (is_object($app)) $app->setDatabaseInstance($connectionInstance);

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>