ENH: Improved cassandra

Author: Julien Jomier

core/models/base/UserModelBase.php

@@ -73,11 +73,11 @@ public function createUser($email,$password,$firstname,$lastname,$admin=0)
     $feedpolicyuserModel=$this->ModelLoader->loadModel('Feedpolicyuser');
 
     $anonymousGroup=$groupModel->load(MIDAS_GROUP_ANONYMOUS_KEY);
-/*
+
     $folderGlobal=$folderModel->createFolder('user_' . $userDao->getKey(),'Main folder of ' . $userDao->getFullName(),MIDAS_FOLDER_USERPARENT);
     $folderPrivate=$folderModel->createFolder('Private','Private folder of ' . $userDao->getFullName(),$folderGlobal);
     $folderPublic=$folderModel->createFolder('Public','Public folder of ' . $userDao->getFullName(),$folderGlobal);
-
+  
     $folderpolicygroupModel->createPolicy($anonymousGroup,$folderPublic,MIDAS_POLICY_READ);
     $folderpolicyuserModel->createPolicy($userDao,$folderPrivate,MIDAS_POLICY_ADMIN);
     $folderpolicyuserModel->createPolicy($userDao,$folderGlobal,MIDAS_POLICY_ADMIN);
@@ -93,7 +93,7 @@ public function createUser($email,$password,$firstname,$lastname,$admin=0)
     $feed=$feedModel->createFeed($userDao,MIDAS_FEED_CREATE_USER,$userDao);
     $feedpolicygroupModel->createPolicy($anonymousGroup,$feed,MIDAS_POLICY_READ);
     $feedpolicyuserModel->createPolicy($userDao,$feed,MIDAS_POLICY_ADMIN);    
-    */
+
     return $userDao;
     }
 

core/models/cassandra/FolderModel.php

@@ -14,7 +14,7 @@ function getByFolder_id($folderid)
     try 
       {
       $folder = new ColumnFamily($this->database->getDB(), 'folder');
-      $folderarray = $folder->get($folderid);
+      $folderarray = $folder->get($folderid);      
       // Add the user_id
       $folderarray[$this->_key] = $folderid;
       $dao= $this->initDao('Folder',$userarray);      

core/models/pdo/FolderModel.php

@@ -11,8 +11,8 @@ class FolderModel extends FolderModelBase
   /** Get a folder by id */
   function getByFolder_id($folderid)
     {
-    $row = $this->database->fetchRow($this->database->select()->where('folder_id = ?', $folderid)); 
-    $dao= $this->initDao(ucfirst($this->_name),$row);
+    $row = $this->database->fetchRow($this->database->select()->where('folder_id = ?', $folderid));
+    $dao=$this->initDao(ucfirst($this->_name),$row);
     return $dao;
     } // end getByFolder_id()
 

library/MIDAS/models/MIDASDatabaseCassandra.php

@@ -131,12 +131,27 @@ public function getValue($var, $key, $dao)
       }
     else if ($this->_mainData[$var]['type'] == MIDAS_DATA && $key!=null)
       {
-      /*$result = $this->fetchRow($this->select()->where($this->_key . ' = ?', $key));
-      if (!isset($result->$var))
+      try 
         {
-        return null;
+        $columnfamily = new ColumnFamily($this->_db,$this->_name);
+        $resultarray = $columnfamily->get($key); // retrieve only what we want      
+        if(!isset($resultarray[$var]))
+          {
+          throw new Zend_Exception('MIDASDatabaseCassandra::getValue() MIDAS_DATA not found. CF='.$this->_name.' and var='.$var);   
+          return null;
+          }
+        return $resultarray[$var];
         }
-      return $result->$var;*/
+      catch(cassandra_NotFoundException $e) 
+        {
+        throw new Zend_Exception('MIDASDatabaseCassandra::getValue() MIDAS_DATA not found.  CF='.$this->_name.' and var='.$var);  
+        return null;  
+        }      
+      catch(Exception $e) 
+        {
+        throw new Zend_Exception($e); 
+        }  
+   
       }
     else if ($this->_mainData[$var]['type'] == MIDAS_ONE_TO_MANY)
       {
@@ -147,17 +162,25 @@ public function getValue($var, $key, $dao)
         {
         throw new Zend_Exception($this->_mainData[$var]['parent_column']. " is not defined in the dao: ".get_class($dao));
         }
+      throw new Zend_Exception('MIDASDatabaseCassandra::getValue() MIDAS_ONE_TO_MANY not defined yet. You can implement it if you want :)');  
+         
       //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'])));
+      if(!method_exists($model, 'getBy'.ucfirst($this->_mainData[$var]['child_column'])))
+        {
+        throw new Zend_Exception(get_class($model).'::getBy'.ucfirst($this->_mainData[$var]['child_column'])." is not implemented");
+        }
+      return call_user_func(array($model,'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)
       {
+      throw new Zend_Exception('MIDASDatabaseCassandra::getValue() MIDAS_MANY_TO_MANY not defined yet. You can implement it if you want :)');  
       //return $this->getLinkedObject($var, $dao);
       }
     else

library/MIDAS/models/MIDASDatabasePdo.php

@@ -86,10 +86,13 @@ public function getValue($var, $key, $dao)
       require_once BASE_PATH.'/library/MIDAS/models/ModelLoader.php';
       $this->ModelLoader = new MIDAS_ModelLoader();
       $model = $this->ModelLoader->loadModel($this->_mainData[$var]['model']);
+      if(!method_exists($model, 'getBy'.ucfirst($this->_mainData[$var]['child_column'])))
+        {
+        throw new Zend_Exception(get_class($model).'::getBy'.ucfirst($this->_mainData[$var]['child_column'])." is not implemented");
+        }
       return call_user_func(array($model,'getBy'.ucfirst($this->_mainData[$var]['child_column'])),
                             array($dao->get($this->_mainData[$var]['parent_column'])));
 
-      //$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)
       {