updates for deleteDatastream and add remove content models

Author: ppound

includes/ObjectManagement.php

@@ -9,30 +9,27 @@ function __destruct() {
 
   /**
    * Deletes the given datastream.
+   *
    * @param string $pid
    *   Fedora object PID
    * @param string $dsid
    *   DSID of the datastream to be deleted
    * @param array $params
-   * @return int|string
+   *   array with logMessage element for audit trail   *
+   *
+   * @return int
+   *   returns an int which will get passed back to Taverna 0 = success
    */
   function deleteDatastream($pid, $dsid, $params) {
-    $object = $this->fedora_object;
-    $datastream = $object[$dsid];
-
+    $return = MS_SUCCESS;
     try {
-      $object->purgeDatastream($datastream->id);
-      $return = MS_SUCCESS;
+      $this->fedora_object->repository->api->m->purgeDatastream($this->fedora_object->id, $dsid, $params);
       $this->log->lwrite("Successfully deleted datastream.", 'DELETE_DATASTREAM', $pid, $dsid, 'SUCCESS');
-      //$arr['logMessage'] = "$dsid datastream successfully deleted using ObjectManagement->deleteDatastream() || SUCCESS";
-      //$this->fedora_object->repository->api->m->modifyDatastream($this->fedora_object->id, $dsid, $arr);
-    } catch (Exception $e) {
+    }
+    catch (Exception $e) {
       $return = MS_FEDORA_EXCEPTION;
-      $this->log->lwrite("Error deleting datastream.", 'DELETE_DATASTREAM', $pid, $dsid, 'ERROR');
-      //$arr['logMessage'] = "$dsid datastream failed to delete using ObjectManagement->deleteDatastream() || ERROR";
-      //$this->fedora_object->repository->api->m->modifyDatastream($this->fedora_object->id, $dsid, $arr);
+      $this->log->lwrite("Error deleting datastream. " . $e->getMessage(), 'DELETE_DATASTREAM', $pid, $dsid, 'ERROR');
     }
-
     return $return;
   }
 }

includes/Relationships.php

@@ -96,10 +96,9 @@ function addImageDimensionsToRels($dsid, $label = 'RELS-INT') {
   function addCModelToObject($outputdsid, $label = 'RELS-EXT', $params) {
     $item = $this->fedora_object;
     $cmodel = $params['cmodel'];
-
+    $return = MS_SUCCESS;
     try{
       $item->relationships->add('info:fedora/fedora-system:def/model#', 'hasModel', $cmodel);
-      $return = MS_SUCCESS;
       $this->log->lwrite("$cmodel CModel relationship successfully added.", 'PROCESS_DATASTREAM', $this->pid, $this->incoming_dsid, 'SUCCESS');
     } catch (Exception $e){
       $return = MS_FEDORA_EXCEPTION;
@@ -120,10 +119,9 @@ function addCModelToObject($outputdsid, $label = 'RELS-EXT', $params) {
   function removeCModelFromObject($outputdsid, $label, $params) {
     $item = $this->fedora_object;
     $cmodel = $params['cmodel'];
-
+    $return = MS_SUCCESS;
     try {
       $item->relationships->remove('info:fedora/fedora-system:def/model#', 'hasModel', $cmodel);
-      $return = MS_SUCCESS;
       $this->log->lwrite("$cmodel CModel relationship successfully removed.", 'PROCESS_DATASTREAM', $this->pid, $this->incoming_dsid, 'SUCCESS');
     } catch (Exception $e) {
       $return = MS_FEDORA_EXCEPTION;

soap_server/RoblibServices.php

@@ -259,8 +259,8 @@ function deleteDatastream($pid, $dsid) {
     $params = array(
       'class' => 'ObjectManagement',
       'function' => 'deleteDatastream',
+      'logMessage' => "$dsid datastream successfully deleted using microservices funcion ObjectManagement->deleteDatastream() || SUCCESS",
     );
-
     return $this->service($pid, $dsid, $dsid, $dsid, $params);
   }