ENH: Worked on the migration script

ENH: Now checking that directories don't have the same names
STYLE: Renamed plusOneView() to incrementViewCount()

Author: Julien Jomier

core/controllers/AdminController.php

@@ -7,7 +7,7 @@ class AdminController extends AppController
 {
   public $_models=array('Errorlog','Assetstore');
   public $_daos=array();
-  public $_components=array('Upgrade','Utility');
+  public $_components=array('Upgrade','Utility','MIDAS2Migration');
   public $_forms=array('Admin','Assetstore');
 
   function init()
@@ -363,8 +363,15 @@ function serversidefilechooserAction()
     } // end function  serversidefilechooserAction
 
 
-    
-    
+  /**
+   * \fn 
+   * \brief 
+   */
+  function migratemidas2Action()
+    {
+    $this->Component->MIDAS2Migration->migrate();
+    exit();  
+    }
 
 } // end class
 

core/controllers/CommunityController.php

@@ -246,7 +246,7 @@ function viewAction()
       $this->Group->addUser($member_group,$this->userSession->Dao);
       }
 
-    $this->Community->plusOneView($communityDao);
+    $this->Community->incrementViewCount($communityDao);
     $this->view->communityDao=$communityDao;
     $this->view->information=array();
     $this->view->feeds=$this->Feed->getFeedsByCommunity($this->userSession->Dao,$communityDao);
@@ -312,61 +312,11 @@ function createAction()
      $form=$this->Form->Community->createCreateForm();
      if($this->_request->isPost()&&$form->isValid($this->getRequest()->getPost()))
        {
-       if($this->Community->getByName($form->getValue('name'))!==false)
-         {
-         throw new Zend_Exception("Community already exists.");
-         }
-       $communityDao=new CommunityDao();
-       $communityDao->setName(ucfirst($form->getValue('name')));
-       $communityDao->setDescription($form->getValue('description'));
-       $communityDao->setPrivacy($form->getValue('privacy'));
-       $communityDao->setCreation(date('c'));
-       $this->Community->save($communityDao);
-
-       $folderGlobal=$this->Folder->createFolder('community_'.$communityDao->getKey(),'Main folder of the community '.$communityDao->getKey(),MIDAS_FOLDER_COMMUNITYPARENT);
-       $folderPublic=$this->Folder->createFolder('Public','Public folder of the community '.$communityDao->getKey(),$folderGlobal);
-       $folderPrivate=$this->Folder->createFolder('Private','Private folder of the community '.$communityDao->getKey(),$folderGlobal);
-
-       $adminGroup=$this->Group->createGroup($communityDao,'Admin group of community '.$communityDao->getKey());
-       $moderatorsGroup=$this->Group->createGroup($communityDao,'Moderators group of community '.$communityDao->getKey());
-       $memberGroup=$this->Group->createGroup($communityDao,'Members group of community '.$communityDao->getKey());
-       $anonymousGroup=$this->Group->load(MIDAS_GROUP_ANONYMOUS_KEY);
-
-       $communityDao->setFolderId($folderGlobal->getKey());
-       $communityDao->setPublicfolderId($folderPublic->getKey());
-       $communityDao->setPrivatefolderId($folderPrivate->getKey());
-       $communityDao->setAdmingroupId($adminGroup->getKey());
-       $communityDao->setModeratorgroupId($moderatorsGroup->getKey());
-       $communityDao->setMembergroupId($memberGroup->getKey());
-       $this->Community->save($communityDao);
-
-       $this->Group->addUser($adminGroup,$this->userSession->Dao);
-       $this->Group->addUser($memberGroup,$this->userSession->Dao);
-
-       $feed=$this->Feed->createFeed($this->userSession->Dao,MIDAS_FEED_CREATE_COMMUNITY,$communityDao,$communityDao);
-       $this->Feedpolicyuser->createPolicy($this->userSession->Dao,$feed,MIDAS_POLICY_ADMIN);
-
-       $this->Folderpolicygroup->createPolicy($adminGroup,$folderGlobal,MIDAS_POLICY_ADMIN);
-       $this->Folderpolicygroup->createPolicy($adminGroup,$folderPublic,MIDAS_POLICY_ADMIN);
-       $this->Folderpolicygroup->createPolicy($adminGroup,$folderPrivate,MIDAS_POLICY_ADMIN);
-       $this->Feedpolicygroup->createPolicy($adminGroup,$feed,MIDAS_POLICY_ADMIN);
-
-       $this->Folderpolicygroup->createPolicy($moderatorsGroup,$folderGlobal,MIDAS_POLICY_READ);
-       $this->Folderpolicygroup->createPolicy($moderatorsGroup,$folderPublic,MIDAS_POLICY_WRITE);
-       $this->Folderpolicygroup->createPolicy($moderatorsGroup,$folderPrivate,MIDAS_POLICY_WRITE);
-       $this->Feedpolicygroup->createPolicy($moderatorsGroup,$feed,MIDAS_POLICY_ADMIN);
-
-       $this->Folderpolicygroup->createPolicy($memberGroup,$folderGlobal,MIDAS_POLICY_READ);
-       $this->Folderpolicygroup->createPolicy($memberGroup,$folderPublic,MIDAS_POLICY_WRITE);
-       $this->Folderpolicygroup->createPolicy($memberGroup,$folderPrivate,MIDAS_POLICY_WRITE);
-       $this->Feedpolicygroup->createPolicy($memberGroup,$feed,MIDAS_POLICY_READ);
-
-       if($communityDao->getPrivacy()!=MIDAS_COMMUNITY_PRIVATE)
-         {
-         $this->Folderpolicygroup->createPolicy($anonymousGroup,$folderPublic,MIDAS_POLICY_READ);
-         $this->Feedpolicygroup->createPolicy($anonymousGroup,$feed,MIDAS_POLICY_READ);
-         }
+       $name = $form->getValue('name');
+       $description = $form->getValue('description');
+       $privacy = $form->getValue('privacy');
 
+       $communityDao = $this->Community->createCommunity($name,$description,$privacy,$this->userSession->Dao);
        $this->_redirect("/community/".$communityDao->getKey());
        }
      else
@@ -382,7 +332,7 @@ function createAction()
 
 
 
-         /** valid  entries (ajax)*/
+    /** valid  entries (ajax)*/
     public function validentryAction()
       {
       if(!$this->getRequest()->isXmlHttpRequest())

core/controllers/FolderController.php

@@ -71,7 +71,7 @@ public function viewAction()
       $header.="</ul>";
       }
 
-    $this->Folder->plusOneView($folder);
+    $this->Folder->incrementViewCount($folder);
     $this->view->mainFolder=$folder;
     $this->view->folders=$folders;
     $this->view->items=$items;

core/controllers/ImportController.php

@@ -133,7 +133,6 @@ private function _recursiveParseDirectory($path,$currentdir)
           $item->setName($fileInfo->getFilename());
           $this->Item->save($item);
 
-          
           // Set the keyword for the item
           $keyword = new ItemKeywordDao();
           $keyword->setValue($fileInfo->getFilename());

core/controllers/ItemController.php

@@ -74,7 +74,7 @@ function viewAction()
       setcookie('recentItems'.$this->userSession->Dao->getKey(), serialize($recentItems), time()+60*60*24*30,'/'); //30 days
       }
     $itemRevision=$this->Item->getLastRevision($itemDao);
-    $this->Item->plusOneView($itemDao);
+    $this->Item->incrementViewCount($itemDao);
     $itemDao->lastrevision=$itemRevision;
     $itemDao->revisions=$itemDao->getRevisions();
     $itemDao->creation=$this->Component->Date->formatDate(strtotime($itemRevision->getDate()));