Doctrine

Timestamp:

10/21/08 23:12:21 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1568

Location:

branches

Files:

• 1.0/lib/Doctrine.php (modified) (1 diff)
• 1.0/lib/Doctrine/Data.php (modified) (2 diffs)
• 1.0/lib/Doctrine/Data/Import.php (modified) (1 diff)
• 1.1/lib/Doctrine.php (modified) (1 diff)
• 1.1/lib/Doctrine/Data.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Data/Import.php (modified) (1 diff)

branches/1.0/lib/Doctrine.php

@@ -842 +842 @@
         $data = new Doctrine_Data();
 
-        if ( ! $append) {
-            $data->purge();
-        }
-
-        return $data->importData($yamlPath, 'yml');
+        return $data->importData($yamlPath, 'yml', array(), $append);
     }
 

branches/1.0/lib/Doctrine/Data.php

@@ -214 +214 @@
      * @return void
      */
-    public function importData($directory, $format = 'yml', $models = array())
+    public function importData($directory, $format = 'yml', $models = array(), $append = false)
     {
         $import = new Doctrine_Data_Import($directory);
@@ -220 +220 @@
         $import->setModels($models);
         
-        return $import->doImport();
+        return $import->doImport($append);
     }
 

branches/1.0/lib/Doctrine/Data/Import.php

@@ -103 +103 @@
      * @return void
      */
-    public function doImport()
+    public function doImport($append = false)
     {
         $array = $this->doParsing();
+        
+        if ( ! $append) {
+            $this->purge(array_reverse(array_keys($array)));
+        }
+        
         $this->_loadData($array);
     }

branches/1.1/lib/Doctrine.php

@@ -857 +857 @@
         $data = new Doctrine_Data();
 
-        if ( ! $append) {
-            $data->purge();
-        }
-
-        return $data->importData($yamlPath, 'yml');
+        return $data->importData($yamlPath, 'yml', array(), $append);
     }
 

branches/1.1/lib/Doctrine/Data.php

@@ -214 +214 @@
      * @return void
      */
-    public function importData($directory, $format = 'yml', $models = array())
+    public function importData($directory, $format = 'yml', $models = array(), $append = false)
     {
         $import = new Doctrine_Data_Import($directory);
@@ -220 +220 @@
         $import->setModels($models);
         
-        return $import->doImport();
+        return $import->doImport($append);
     }
 

branches/1.1/lib/Doctrine/Data/Import.php

@@ -103 +103 @@
      * @return void
      */
-    public function doImport()
+    public function doImport($append = false)
     {
         $array = $this->doParsing();
+        
+        if ( ! $append) {
+            $this->purge(array_reverse(array_keys($array)));
+        }
+        
         $this->_loadData($array);
     }