Adding method skipExisting at sfIsisImporter

1 files changed, 24 insertions, 2 deletions

diff --git a/lib/sfIsisImporter.class.php b/lib/sfIsisImporter.class.php
index 22541e3..d0d9a9f 100644
--- a/lib/sfIsisImporter.class.php
+++ b/lib/sfIsisImporter.class.php
@@ -142,21 +142,43 @@ class sfIsisImporter extends IsisConnector
 
     if ($id)
     {
-      if (!call_user_func(array($base_model, 'getById'), $id))
+      $existing = call_user_func(array($base_model, 'getById'), $id);
+
+      if (!$existing)
       {
         $this->setBaseModelId($model);
         return $model;
       }
-      else
+      elseif ($this->skipExisting())
       {
         return false;
       }
+      else
+      {
+        return $existing;
+      }
     }
 
     return $model;
   }
 
   /**
+   * Check if ISIS database configuration is set to not skip existing
+   * entries during an import.
+   *
+   * @return boolean
+   */
+  public function skipExisting()
+  {
+    if (isset($this->format['import']['skip_existing']))
+    {
+      return $this->format['import']['skip_existing'];
+    }
+
+    return true;
+  }
+
+  /**
    * Set the primary key for the model by getting it or just saving it.
    *
    * @param object $model Base model