ENH: Refs #0963. Moved all the remaining apis (in api module) to core.

midasplatform · Apr 5, 2013 · cccee69 · cccee69
1 parent e7aa956
commit cccee69
Show file tree

Hide file tree

Showing 9 changed files with 505 additions and 449 deletions.
diff --git a/core/controllers/api/BitstreamController.php b/core/controllers/api/BitstreamController.php
@@ -29,8 +29,11 @@ class Rest_BitstreamController extends ApiController
    */
   public function indexAction()
     {
-    $apiFunctions['default'] = 'bitstreamCount';
-    $apiFunctions['count'] = 'bitstreamCount';
+    $apiFunctions = array(
+      'default' => 'bitstreamCount',
+      'exists'  => 'bitstreamCount',
+      'download'  => 'bitstreamDownloadByChecksum'
+      );
     $this->_genericAction($this->_request->getParams(), 'index', $apiFunctions);
     }
 
@@ -60,7 +63,10 @@ public function headAction()
    */
   public function getAction()
     {
-    $apiFunctions['default'] = 'bitstreamGet';
+     $apiFunctions = array(
+      'default' => 'bitstreamGet',
+      'download'  => 'bitstreamDownloadById'
+      );
     $this->_genericAction($this->_request->getParams(), 'get', $apiFunctions);
     }
 

diff --git a/core/controllers/api/FolderController.php b/core/controllers/api/FolderController.php
@@ -53,7 +53,8 @@ public function getAction()
     $apiFunctions = array(
       'default' => 'folderGet',
       'children' => 'folderChildren',
-      'permission' => 'folderListPermissions'
+      'permission' => 'folderListPermissions',
+      'download' => 'folderDownload'
       );
     $this->_genericAction($this->_request->getParams(), 'get', $apiFunctions);
     }

diff --git a/core/controllers/api/ItemController.php b/core/controllers/api/ItemController.php
@@ -57,7 +57,8 @@ public function getAction()
     $apiFunctions = array(
       'default' => 'itemGet',
       'metadata'=> 'itemGetmetadata',
-      'permission' => 'itemListPermissions'
+      'permission' => 'itemListPermissions',
+      'download' => 'itemDownload'
       );
     $this->_genericAction($this->_request->getParams(), 'get', $apiFunctions);
     }

diff --git a/core/controllers/api/SystemController.php b/core/controllers/api/SystemController.php
@@ -39,7 +39,8 @@ public function indexAction()
       'metadataqualifiers' => 'metadataQualifiersList',
       'uploadeoffset' => 'uploadGetoffset',
       'metadatatypes' => 'metadataTypesList',
-      'metadaelements' => 'metadataElementsList'
+      'metadaelements' => 'metadataElementsList',
+      'uploadtoken' => 'uploadGeneratetoken'
       );
     $this->_genericAction($this->_request->getParams(), 'index', $apiFunctions);
     }
@@ -73,6 +74,8 @@ public function postAction()
     $apiFunctions = array(
       'default' => 'adminDatabaseCleanup',
       'databasecleanup' => 'adminDatabaseCleanup',
+      'defaultapikey' => 'userApikeyDefault',
+      'upload' => 'uploadPerform'
       );
     $this->_genericAction($this->_request->getParams(), 'post', $apiFunctions);
     }