BUG: Fixing issue with recursive save

midasplatform · Mar 23, 2011 · 518ffe2 · 518ffe2
1 parent c8bd8ac
commit 518ffe2
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/core/models/pdo/BitstreamModel.php b/core/models/pdo/BitstreamModel.php
@@ -11,7 +11,7 @@ public function save($dao)
     $stack=debug_backtrace();
     if($stack[1]['class']=="ItemRevisionModel"&&$stack[1]['function']=='addBitstream')
       {
-      return $this->database->save($dao);
+      return parent::save($dao);
       }
     throw new Zend_Exception(" Do not use, use method addBitstream in ItemRevision Model.");
     }//end Save

diff --git a/core/models/pdo/FeedModel.php b/core/models/pdo/FeedModel.php
@@ -297,7 +297,7 @@ function delete($feeDao)
       {
       $this->database->removeLink('communities', $feeDao, $c);
       }
-    return $this->delete($feeDao);
+    return parent::delete($feeDao);
     } // end delete
 
 } // end class

diff --git a/library/MIDAS/models/MIDASDatabaseCassandra.php b/library/MIDAS/models/MIDASDatabaseCassandra.php
@@ -85,7 +85,60 @@ public function delete($dao)
     } // end function delete 
 
 
-
+  /**
+   * @method public  get()
+   * Generic get function. You can define custom function.
+   * @param $var name of the element we want to get
+   * @param $key of the table
+   * @return value
+   */
+  public function getValue($var, $key, $dao)
+    {
+    if (!isset($this->_mainData[$var]))
+      {
+      throw new Zend_Exception("Database Cassandra " . $this->_name . ": var $var is not defined here.");
+      }
+
+    if (method_exists($this, 'get' . ucfirst($var)))
+      {
+      return call_user_func('get' . ucfirst($var), $key, $var);
+      }
+    else if ($this->_mainData[$var]['type'] == MIDAS_DATA && $key!=null)
+      {
+      /*$result = $this->fetchRow($this->select()->where($this->_key . ' = ?', $key));
+      if (!isset($result->$var))
+        {
+        return null;
+        }
+      return $result->$var;*/
+      }
+    else if ($this->_mainData[$var]['type'] == MIDAS_ONE_TO_MANY)
+      {
+      require_once BASE_PATH.'/library/MIDAS/models/ModelLoader.php';
+      $this->ModelLoader = new MIDAS_ModelLoader();
+      $model = $this->ModelLoader->loadModel($this->_mainData[$var]['model']);
+      if(!$dao->get($this->_mainData[$var]['parent_column']))
+        {
+        throw new Zend_Exception($this->_mainData[$var]['parent_column']. " is not defined in the dao: ".get_class($dao));
+        }
+      //return $model->__call("findBy" . ucfirst($this->_mainData[$var]['child_column']), array($dao->get($this->_mainData[$var]['parent_column'])));
+      }
+    else if ($this->_mainData[$var]['type'] == MIDAS_MANY_TO_ONE)
+      {
+      require_once BASE_PATH.'/library/MIDAS/models/ModelLoader.php';
+      $this->ModelLoader = new MIDAS_ModelLoader();
+      $model = $this->ModelLoader->loadModel($this->_mainData[$var]['model']);
+      //return $model->__call("getBy" . ucfirst($this->_mainData[$var]['child_column']), array($dao->get($this->_mainData[$var]['parent_column'])));
+      }
+    else if ($this->_mainData[$var]['type'] == MIDAS_MANY_TO_MANY)
+      {
+      //return $this->getLinkedObject($var, $dao);
+      }
+    else
+      {
+      throw new Zend_Exception('Unable to load data type ' . $var);
+      }
+    } 
 
 } // end class MIDASDatabaseCassandra
 ?>
diff --git a/library/MIDAS/models/MIDASDatabaseInterface.php b/library/MIDAS/models/MIDASDatabaseInterface.php
@@ -3,6 +3,7 @@ interface MIDASDatabaseInterface
 {
   public function save($dao);
   public function delete($dao);
+  public function getValue($var, $key, $dao);
 
 } // end interface
 ?>
diff --git a/library/MIDAS/models/MIDASDatabasePdo.php b/library/MIDAS/models/MIDASDatabasePdo.php
@@ -55,7 +55,7 @@ public function getValue($var, $key, $dao)
     {
     if (!isset($this->_mainData[$var]))
       {
-      throw new Zend_Exception("Model PDO " . $this->_name . ": var $var is not defined here.");
+      throw new Zend_Exception("Database PDO " . $this->_name . ": var $var is not defined here.");
       }
     if (method_exists($this, 'get' . ucfirst($var)))
       {