Merge pull request #91 from bwoodhead/6.x

Improved error handling and removed getDataStreamDissemination false positive
Islandora · Apr 2, 2012 · e48b828 · e48b828
2 parents dc4f25e + 860069f
commit e48b828
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ContentModel.inc b/ContentModel.inc
@@ -1374,6 +1374,7 @@ class ContentModel extends XMLDatastream {
                   else {
                     $status = $class->$methodName($param_array, $method->getAttribute('dsid'), $file, $method->getAttribute('modified_files_ext'));
                     if ($status !== TRUE) {
+                      self::$errors[] = 'Execute Ingest Rules: method \'' . $className . '->' . $methodName . '\' failed.';
                       $ret = FALSE;
                     }
                   }

diff --git a/api/fedora_item.inc b/api/fedora_item.inc
@@ -406,15 +406,18 @@ class Fedora_Item {
    * Get datastream dissemination
    * @param type $dsid
    * @param type $as_of_date_time
-   * @return string
+   * @param type $quiet
+   * @return null 
    */
-  function get_datastream_dissemination($dsid, $as_of_date_time = "") {
+  function get_datastream_dissemination($dsid, $as_of_date_time = "", $quiet=TRUE) {
     $params = array(
       'pid' => $this->pid,
       'dsID' => $dsid,
       'asOfDateTime' => $as_of_date_time,
     );
-    $object = self::soap_call('getDataStreamDissemination', $params);
+
+    // Make soap call with quite
+    $object = self::soap_call('getDataStreamDissemination', $params, $quiet);
     if (!empty($object)) {
       $content = $object->dissemination->stream;
       $content = trim($content);