batch generation of models

diff --git a/ipf/command/buildmodels.php b/ipf/command/buildmodels.php
index 41e19d9337fabe836f6bcf3c2cbc9a256391a1a3..b6996e8fbcf286f6e302555b8a821022c3d537a9 100644 (file)
--- a/ipf/command/buildmodels.php
+++ b/ipf/command/buildmodels.php
@@ -11,12 +11,12 @@ class IPF_Command_BuildModels
 
         $project = IPF_Project::getInstance();
 
+        $paths = array();
+        foreach ($project->customApps() as $app)
+            $paths[] = $app->getPath();
+
         $extraAllowedReferences = $this->frameworkModels($project);
-        foreach ($project->customApps() as $app) {
-            print $app->getName()."\n";
-            $models = IPF_ORM::generateModelsFromYaml($app->getPath(), $extraAllowedReferences);
-            $extraAllowedReferences = array_merge($extraAllowedReferences, $models);
-        }
+        IPF_ORM::generateModelsFromYaml($paths, $extraAllowedReferences);
     }
 
     private function frameworkModels($project)

diff --git a/ipf/orm.php b/ipf/orm.php
index 6ec89280d4b96779bb9b464ed3d759d9127119a7..a0f573ec3810b6d9626c022145c9b3936456c82d 100644 (file)
--- a/ipf/orm.php
+++ b/ipf/orm.php
@@ -177,15 +177,19 @@ final class IPF_ORM
 
     public static function generateModelsFromYaml($directory, $extraAllwedReferences=array())
     {
+        $files = array();
+        foreach ((array)$directory as $dir)
+            $files[] = $dir . '/models.yml';
+
         // load schema
         $import = new IPF_ORM_Import_Schema;
-        $definitions = $import->importSchema($directory . '/models.yml', $extraAllwedReferences);
+        $definitions = $import->importSchema($files, $extraAllwedReferences);
 
         // build
-        $targetPath = $directory . '/models';
         $models = array();
         foreach ($definitions as $name => $definition) {
             print "    $name\n";
+            $targetPath = substr($definition['input_file'], 0, -4);
 
             $builder = new IPF_ORM_Import_Builder;
             $builder->buildRecord($definition, $targetPath);

diff --git a/ipf/orm/import/schema.php b/ipf/orm/import/schema.php
index 9b345adfa9ebd935a93c122991a189e2a686ad25..f7c22d9af05a014cec1881eae4bab84e252f4c4d 100644 (file)
--- a/ipf/orm/import/schema.php
+++ b/ipf/orm/import/schema.php
@@ -81,7 +81,15 @@ class IPF_ORM_Import_Schema
 
     public function importSchema($filename, $extraAllwedReferences)
     {
-        $array = $this->parseSchema($filename);
+        $filename = (array)$filename;
+        $array = array();
+        foreach ($filename as $fn) {
+            $definitions = $this->parseSchema($fn);
+            foreach ($definitions as &$definition)
+                $definition['input_file'] = $fn;
+            $array = array_merge($array, $definitions);
+        }
+
         $array = $this->_buildRelationships($array, $extraAllwedReferences);
         $array = $this->_processInheritance($array);
         return $array;