Changeset 538

Timestamp:

2008年10月04日 16時22分56秒 (2 months ago)

Author:

iteman

Message:

- Updated.

Files:

• trunk/src/Piece/ORM.php (modified) (3 diffs)

trunk/src/Piece/ORM.php

@@ -38 +38 @@
 namespace Piece;
 
-use Piece::ORM::Config::ConfigFactory;
+use Piece::ORM::Config::Reader;
 use Piece::ORM::Context;
 use Piece::ORM::Mapper::MapperFactory;
@@ -92 +92 @@
      *
      * First this method tries to load a configuration from a configuration file in
-     * the given configration directory using
-     * Piece::ORM::Config::ConfigFactory::factory(). The method creates a new object
-     * if the load failed.
+     * the given configration directory using a Piece::ORM::Config::Reader object.
+     * The method creates a new object if the load failed.
      * Second this method sets the configuration to the current context. And also
      * this method sets the configuration directory for the mapper configuration, and
@@ -111 +110 @@
         Registry::setContext(new Context());
         $context = Registry::getContext();
-        $config = ConfigFactory::factory($configDirectory, $cacheDirectory);
-        $context->setConfiguration($config);
         $context->setMapperConfigDirectory($mapperConfigDirectory);
         $context->setCacheDirectory($cacheDirectory);
+
+        $reader = new Reader($configDirectory);
+        $config = $reader->read();
+        $context->setConfiguration($config);
+
         $defaultDatabase = $config->getDefaultDatabase();
         if (!is_null($defaultDatabase)) {