ENH: optimized browser

BUG: Fixed keyword import
BUG: Fixed community search

Author: Charles Marion

application/controllers/BrowseController.php

@@ -7,7 +7,7 @@ class BrowseController extends AppController
 {
   public $_models=array('Folder','User','Community','Folder','Item');
   public $_daos=array('Folder','User','Community','Folder','Item');
-  public $_components=array('Date','Utility');
+  public $_components=array('Date','Utility','Sortdao');
 
   /** Init Controller */
   function init()
@@ -18,17 +18,27 @@ function init()
   /** Index Action*/
   public function indexAction()
     {
+    
     $communities=array();
     $items=array();
     $header="";
 
     $communities=$this->User->getUserCommunities($this->userSession->Dao);
-    $header.="> Data";
+    $communities=array_merge($communities, $this->Community->getPubicCommunities());
+    
+    $header.="<ul class='pathBrowser'>";
+    $header.=" <li class='pathData'><a href='{$this->view->webroot}/browse'>Data</a></li>";
+    $header.="</ul>";
 
     $this->view->Date=$this->Component->Date;
 
+    $this->Component->Sortdao->field='name';
+    $this->Component->Sortdao->order='asc';
+    usort($communities, array($this->Component->Sortdao,'sortByName'));
+    $communities=$this->Component->Sortdao->arrayUniqueDao($communities );
+    
     $this->view->communities=$communities;
-    $this->view->header=substr($header,2);
+    $this->view->header=$header;
 
     $javascriptText=array();
     $javascriptText['view']=$this->t('View');
@@ -48,10 +58,11 @@ public function indexAction()
   /** get getfolders content (ajax function for the treetable) */
   public function getfolderscontentAction()
     {
-    if(!$this->getRequest()->isXmlHttpRequest())
+ /*   if(!$this->getRequest()->isXmlHttpRequest())
      {
      throw new Zend_Exception("Why are you here ? Should be ajax.");
-     }
+     }*/
+
     $this->_helper->layout->disableLayout();
     $this->_helper->viewRenderer->setNoRender();
     $folderIds=$this->_getParam('folders');
@@ -65,6 +76,7 @@ public function getfolderscontentAction()
       {
       throw new Zend_Exception("Folder doesn't exist");
       }
+      
     $folders=$this->Folder->getChildrenFoldersFiltered($parents,$this->userSession->Dao,MIDAS_POLICY_READ);
     $items=$this->Folder->getItemsFiltered($parents,$this->userSession->Dao,MIDAS_POLICY_READ);
     $jsonContent=array();
@@ -84,8 +96,7 @@ public function getfolderscontentAction()
       $tmp['item_id']=$item->getItemId();
       $tmp['name']=$item->getName();
       $tmp['parent_id']=$item->parent_id;
-      $itemRevision=$this->Item->getLastRevision($item);
-      $tmp['creation']=$this->Component->Date->ago($itemRevision->getDate(),true);
+      $tmp['creation']=$this->Component->Date->ago($item->getDate(),true);
       $tmp['size']=$this->Component->Utility->formatSize($item->getSizebytes());
       $tmp['policy']=$item->policy;
       $jsonContent[$item->parent_id]['items'][]=$tmp;
@@ -100,14 +111,15 @@ public function getfolderssizeAction()
     if(!$this->getRequest()->isXmlHttpRequest())
      {
      throw new Zend_Exception("Why are you here ? Should be ajax.");
-     }     
+     }    
 
     $this->_helper->layout->disableLayout();
     $this->_helper->viewRenderer->setNoRender();
     $folderIds=$this->_getParam('folders');
     if(!isset($folderIds))
      {
-     throw new Zend_Exception("Please set the folder Id");
+     echo "[]";
+     return;
      }
     $folderIds=explode('-',$folderIds);
     $folders= $this->Folder->load($folderIds);
@@ -145,7 +157,14 @@ public function getelementinfoAction()
       case 'folder':
         $folder=$this->Folder->load($id);
         $jsonContent=array_merge($jsonContent,$folder->_toArray());
-        $jsonContent['creation']=$jsonContent['date'];
+        if(isset($jsonContent['date']))
+          {
+          $jsonContent['creation']=$jsonContent['date'];
+          }        
+        else
+          {
+          $jsonContent['creation']=date('c');
+          }
         break;
       case 'item':
         $item=$this->Item->load($id);

application/controllers/CommunityController.php

@@ -4,7 +4,7 @@ class CommunityController extends AppController
   {
   public $_models=array('Community','Folder','Group','Folderpolicygroup','Group','User','Feed',"Feedpolicygroup","Feedpolicyuser");
   public $_daos=array('Community','Folder','Group','Folderpolicygroup','Group','User');
-  public $_components=array();
+  public $_components=array('Sortdao');
   public $_forms=array('Community');
 
   /** Init Controller */
@@ -26,10 +26,14 @@ function indexAction()
     $this->view->json['community']['titleCreateLogin']=$this->t('Please log in');
     $this->view->json['community']['contentCreateLogin']=$this->t('You need to be logged in to be able to create a community.');
 
-    if($this->logged)
-      {
-      $this->view->userCommunities=$this->User->getUserCommunities($this->userSession->Dao);
-      }
+    $communities=$this->User->getUserCommunities($this->userSession->Dao);
+    $communities=array_merge($communities, $this->Community->getPubicCommunities());
+    $this->Component->Sortdao->field='name';
+    $this->Component->Sortdao->order='asc';
+    usort($communities, array($this->Component->Sortdao,'sortByName'));
+    $communities=$this->Component->Sortdao->arrayUniqueDao($communities );
+    
+    $this->view->userCommunities=$communities;
     }//end index
 
   /** view a community*/

application/controllers/FolderController.php

@@ -16,6 +16,7 @@ function init()
       {
       $this->_forward('view',null,null,array('folderId'=>$actionName));
       }
+    $this->view->activemenu = 'browse'; // set the active menu
     }  // end init()
 
   /** View Action*/
@@ -38,25 +39,28 @@ public function viewAction()
       {
       $folders=$this->Folder->getChildrenFoldersFiltered($folder,$this->userSession->Dao,MIDAS_POLICY_READ);
       $items=$this->Folder->getItemsFiltered($folder,$this->userSession->Dao,MIDAS_POLICY_READ);
-      $header.="> {$folder->getName()}";
+      $header.=" <li class='pathFolder'><a href='{$this->view->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a></li>";
       $parent=$folder->getParent();
       while($parent!==false)
         {
         if(strpos($parent->getName(), 'community')!==false&&$this->Folder->getCommunity($parent)!==false)
           {
           $community=$this->Folder->getCommunity($parent);
-          $header="> {$community->getName()} ".$header;
+          $header=" <li class='pathCommunity'><a href='{$this->view->webroot}/community/{$community->getKey()}'>{$community->getName()}</a></li>".$header;
           }
         else
           {
-          $header="> {$parent->getName()} ".$header;
+          $header=" <li class='pathFolder'><a href='{$this->view->webroot}/folder/{$parent->getKey()}'>{$parent->getName()}</a></li>".$header;
           }
         $parent=$parent->getParent();
         }
+      $header="<ul class='pathBrowser'>
+               <li class='pathData'><a href='{$this->view->webroot}/browse'>Data</a></li>".$header;
+      $header.="</ul>";
       }
     $this->view->folders=$folders;
     $this->view->items=$items;
-    $this->view->header=substr($header,2);
+    $this->view->header=$header;
 
     $javascriptText=array();
     $javascriptText['view']=$this->t('View');

application/controllers/ImportController.php

@@ -133,9 +133,9 @@ private function _recursiveParseDirectory($path,$currentdir)
           $this->Item->save($item);
 
           // Set the keyword for the item
-          $keyword = new KeywordDao;
+          $keyword = new ItemKeywordDao;
           $keyword->setValue($fileInfo->getFilename());
-          $this->Keyword->insertKeyword($keyword);
+          $this->ItemKeyword->insertKeyword($keyword);
 
           $this->Item->addKeyword($item,$keyword);
 

application/controllers/SearchController.php

@@ -37,7 +37,6 @@ public function liveAction()
 
     // Search for the items
     $ItemsDao = $this->ItemKeyword->getItemsFromSearch($search,$this->userSession->Dao);
-    
     // Search for the folders
     $FoldersDao = $this->Folder->getFoldersFromSearch($search,$this->userSession->Dao); 
 
@@ -176,7 +175,7 @@ public function liveAction()
       echo ', "value":"'.$communityDao->getName().'"'; 
       if($communityDao->count==1)
         {
-        echo ', "communityid":"'.$communityDao->getCommunityId().'"'; 
+        echo ', "communityid":"'.$communityDao->getKey().'"'; 
         }
       echo ', "category":"Communities"';   
       $id++;

application/controllers/UploadController.php

@@ -2,8 +2,8 @@
 
 class UploadController extends AppController
   {
-  public $_models=array('User','Item','ItemRevision','Folder','Itempolicyuser','Itempolicygroup','Group','Feed',"Feedpolicygroup","Feedpolicyuser",'Bitstream','Assetstore');
-  public $_daos=array('User','Item','ItemRevision','Bitstream','Folder');
+  public $_models=array('User','Item','ItemRevision','Folder','Itempolicyuser',"ItemKeyword",'Itempolicygroup','Group','Feed',"Feedpolicygroup","Feedpolicyuser",'Bitstream','Assetstore');
+  public $_daos=array('User','Item','ItemRevision','Bitstream','Folder',"ItemKeyword");
   public $_components=array('Httpupload');
   public $_forms=array('Upload');
 
@@ -162,6 +162,12 @@ private function createUploadedItem($userDao,$name,$path,$privacy=null)
       $item = new ItemDao;
       $item->setName($name);
       $this->Item->save($item);
+      
+      // Set the keyword for the item
+      $keyword = new ItemKeywordDao();
+      $keyword->setValue($name);
+      $this->ItemKeyword->insertKeyword($keyword);
+      
       $feed=$this->Feed->createFeed($this->userSession->Dao,MIDAS_FEED_CREATE_ITEM,$item);
       if(isset($privacy)&&$privacy=='public')
         {
@@ -180,6 +186,8 @@ private function createUploadedItem($userDao,$name,$path,$privacy=null)
       $itemRevisionDao->setChanges('Initial revision');
       $itemRevisionDao->setUser_id($userDao->getKey());
       $this->Item->addRevision($item,$itemRevisionDao);
+
+      $this->Item->addKeyword($item,$keyword);
 
       $defaultAssetStoreId=Zend_Registry::get('configGlobal')->defaultassetstore->id;
       $assetstoreDao=$this->Assetstore->load($defaultAssetStoreId);

application/controllers/components/DateComponent.php

@@ -7,6 +7,10 @@ static public function ago($timestamp,$only_time=false)
     if(!is_numeric($timestamp))
       {
       $timestamp=strtotime($timestamp);
+      if($timestamp==false)
+        {
+        return "";
+        }
       }
      $difference = time() - $timestamp;
      $periods = array("second", "minute", "hour", "day", "week", "month", "years", "decade");

application/controllers/components/SortDaoComponent.php

@@ -50,5 +50,29 @@ public function sortByName($a,$b)
       return ($a_n < $b_n ) ? 1 : -1; 
       }
     }//end sortByDate
+    
+    
+  public function arrayUniqueDao($array, $keep_key_assoc = false)
+    {
+    $duplicate_keys = array();
+    $tmp         = array();       
+
+    foreach ($array as $key=>$val)
+      {
+      // convert objects to arrays, in_array() does not support objects
+      if (is_object($val))
+          $val = (array)$val;
+
+      if (!in_array($val, $tmp))
+          $tmp[] = $val;
+      else
+          $duplicate_keys[] = $key;
+      }
+
+    foreach ($duplicate_keys as $key)
+        unset($array[$key]);
+
+    return $keep_key_assoc ? $array : array_values($array);
+    }
 } // end class
 ?>

application/models/pdo/CommunityModel.php

@@ -29,6 +29,28 @@ class CommunityModel extends AppModelPdo
     'feeds' =>  array('type'=>MIDAS_MANY_TO_MANY, 'model'=>'Feed', 'table' => 'feed2community', 'parent_column'=> 'community_id', 'child_column' => 'feed_id'),
   );
 
+  /* get public Communities
+   * 
+   * @return Array of Community Dao
+   */
+  function getPubicCommunities($limit=20)
+    {
+    if(!is_numeric($limit))
+      {
+      throw new Zend_Exception("Error parameter.");
+      }
+    $sql = $this->select()->from($this->_name)
+                          ->where('privacy != ?',MIDAS_COMMUNITY_PRIVATE)
+                          ->limit($limit);
+      
+    $rowset = $this->fetchAll($sql);
+    $return = array();
+    foreach($rowset as $row)
+      {      
+      $return[] = $this->initDao('Community', $row);
+      }
+    return $return;
+    }
 
   /** Return a list of communities corresponding to the search */
   function getCommunitiesFromSearch($search,$userDao)
@@ -56,10 +78,10 @@ function getCommunitiesFromSearch($search,$userDao)
     $return = array();
     foreach($rowset as $row)
       {
-      $tmpDao = new FolderDao();
+      $tmpDao = new CommunityDao();
       $tmpDao->count = $row['count(*)'];
       $tmpDao->setName($row->name);
-      $tmpDao->setFolderId($row->folder_id);
+      $tmpDao->setCommunityId($row->community_id);
       $return[] = $tmpDao;
       unset($tmpDao);
       }