ENH: refs #236. api: Set exception code on folder.children if caught

Author: zachmullen

core/models/pdo/FolderModel.php

@@ -123,7 +123,7 @@ public function getSizeFiltered($folders, $userDao = null, $policy = 0)
       {
       if(!$folder instanceof FolderDao)
         {
-        throw new Zend_Exception("Should be a folder" );
+        throw new Zend_Exception("Should be a folder");
         }
       $subqueryUser = $this->database->select()
                       ->setIntegrityCheck(false)
@@ -205,7 +205,7 @@ function getRoot($folder)
     {
     if(!$folder instanceof FolderDao)
       {
-      throw new Zend_Exception("Should be a folder" );
+      throw new Zend_Exception("Should be a folder");
       }
 
     $row = $this->database->fetchRow($this->database->select()->setIntegrityCheck(false)
@@ -247,7 +247,7 @@ function getAllChildren($folder, $userDao, $admin = false)
 
     if(!$folder instanceof FolderDao)
       {
-      throw new Zend_Exception("Should be a folder" );
+      throw new Zend_Exception("Should be a folder");
       }
     $subqueryUser = $this->database->select()
                     ->setIntegrityCheck(false)
@@ -302,7 +302,7 @@ function delete($folder, $recursive = false)
     {
     if(!$folder instanceof FolderDao)
       {
-      throw new Zend_Exception("Should be a folder" );
+      throw new Zend_Exception("Should be a folder");
       }
     if(!$folder->saved)
       {

modules/api/controllers/components/ApiComponent.php

@@ -676,8 +676,15 @@ function folderChildren($args)
     $folder = $folderModel->load($id);
 
     $userDao = $this->_getUser($args);
-    $folders = $folderModel->getChildrenFoldersFiltered($folder, $userDao);
-    $items = $folderModel->getItemsFiltered($folder, $userDao);
+    try
+      {
+      $folders = $folderModel->getChildrenFoldersFiltered($folder, $userDao);
+      $items = $folderModel->getItemsFiltered($folder, $userDao);
+      }
+    catch(Exception $e)
+      {
+      throw new Exception($e->getMessage(), MIDAS_INTERNAL_ERROR);
+      }
 
     return array('folders' => $folders, 'items' => $items);
     }