ENH: Improving database support

Author: Julien Jomier

core/models/pdo/FeedModel.php

@@ -247,7 +247,7 @@ function createFeed($userDao,$type,$ressource,$communityDao=null)
         throw new Zend_Exception("Unable to defined the type of feed");
         break;
       }
-    $this->database->save($feed);
+    $this->save($feed);
 
     if($communityDao instanceof CommunityDao)
       {
@@ -269,7 +269,7 @@ function addCommunity($feed,$community)
       {
       throw new Zend_Exception("Should be an feed.");
       }
-    $this->link('communities',$feed,$community);
+    $this->database->link('communities',$feed,$community);
     } // end addCommunity
 
   /** Delete Dao

core/models/pdo/FeedpolicygroupModel.php

@@ -27,14 +27,14 @@ public function createPolicy($group, $feed, $policy)
       }
     if($this->getPolicy($group,$feed) !== false)
       {
-      $this->database->delete($this->getPolicy($group,$feed));
+      $this->delete($this->getPolicy($group,$feed));
       }
     $this->loadDaoClass('FeedpolicygroupDao');
     $policyGroupDao=new FeedpolicygroupDao();
     $policyGroupDao->setGroupId($group->getGroupId());
     $policyGroupDao->setFeedId($feed->getFeedId());
     $policyGroupDao->setPolicy($policy);
-    $this->database->save($policyGroupDao);
+    $this->save($policyGroupDao);
     return $policyGroupDao;
     }
 

core/models/pdo/FeedpolicyuserModel.php

@@ -34,7 +34,7 @@ public function createPolicy($user, $feed, $policy)
     $policyUser->setUserId($user->getUserId());
     $policyUser->setFeedId($feed->getFeedId());
     $policyUser->setPolicy($policy);
-    $this->database->save($policyUser);
+    $this->save($policyUser);
     return $policyUser;
     }
 

core/models/pdo/FolderModel.php

@@ -173,7 +173,7 @@ public function delete($folder)
                           array('left_indice >= ?'=>$leftIndice));
     $this->database->getDB()->update('folder', array('right_indice'=> new Zend_Db_Expr('right_indice - 2')),
                           array('right_indice >= ?'=>$leftIndice));
-    $this->database->delete( $folder);
+    $this->delete( $folder);
     unset($folder->folder_id);
     $folder->saved=false;
     return true;
@@ -292,7 +292,7 @@ function createFolder($name,$description,$parent)
       $parentId=$parent;
       }
     $folder->setParentId($parentId);
-    $this->database->save($folder);
+    $this->save($folder);
     return $folder;
     }
 
@@ -601,7 +601,7 @@ function addItem($folder,$item)
       {
       throw new Zend_Exception("Should be an item.");
       }
-    $this->link('items',$folder,$item);
+    $this->database->link('items',$folder,$item);
     } // end function addItem
 
   /** Return an item by its name

core/models/pdo/FolderpolicygroupModel.php

@@ -34,7 +34,7 @@ public function createPolicy($group, $folder, $policy)
     $policyGroupDao->setGroupId($group->getGroupId());
     $policyGroupDao->setFolderId($folder->getFolderId());
     $policyGroupDao->setPolicy($policy);
-    $this->database->save($policyGroupDao);
+    $this->save($policyGroupDao);
     return $policyGroupDao;
     }
 

core/models/pdo/ItemKeywordModel.php

@@ -111,7 +111,7 @@ function insertKeyword($keyword)
     else
       {
       $keyword->setRelevance(1);
-      $return = parent::save($keyword);
+      $return = $this->save($keyword);
       }
     unset($row);
     return $return;

core/models/pdo/ItemModel.php

@@ -222,7 +222,7 @@ function addKeyword($itemdao,$keyworddao)
       {
       throw new Zend_Exception("Second argument should be a keyword");
       }
-    $this->link('keywords',$itemdao,$keyworddao);
+    $this->database->link('keywords',$itemdao,$keyworddao);
     } // end addKeyword
 
 }  // end class

core/models/pdo/ItempolicyuserModel.php

@@ -27,14 +27,14 @@ public function createPolicy($user, $item, $policy)
       }
     if($this->getPolicy($user,$item) !== false)
       {
-      $this->database->delete($this->getPolicy($user,$item));
+      $this->delete($this->getPolicy($user,$item));
       }
     $this->loadDaoClass('ItempolicyuserDao');
     $policyUser=new ItempolicyuserDao();
     $policyUser->setUserId($user->getUserId());
     $policyUser->setItemId($item->getItemId());
     $policyUser->setPolicy($policy);
-    $this->database->save($policyUser);
+    $this->save($policyUser);
     return $policyUser;
     }
 

library/MIDAS/models/MIDASDatabaseCassandra.php

@@ -36,7 +36,7 @@ function getDB()
      return $this->_db;  
      }    
 
-   /**
+  /**
    * @method public  getValues($key)
    *  Get all the value of a model
    * @param $key
@@ -61,5 +61,31 @@ public function getValues($key)
       }
     } // end method getValues;
 
+  /**
+   * @method public save($dao)
+   * Saves a DAO from the database
+   * @param $dao
+   * @return true/false
+   */  
+  public function save($dao)
+    {
+      
+    } // end function save
+    
+  /**
+   * @method public delete($dao)
+   * Delete a DAO from the database
+   * @param $dao
+   * @return true/false
+   */   
+  public function delete($dao)
+    {
+    
+    
+    } // end function delete 
+    
+    
+    
+    
 } // end class MIDASDatabaseCassandra
 ?>

library/MIDAS/models/MIDASDatabaseInterface.php

@@ -1,7 +1,8 @@
 <?php
 interface MIDASDatabaseInterface
 {
-  
+  public function save($dao);
+  public function delete($dao);
 
 } // end interface
 ?>