From 0d8207325863004e3bc219f300db7d2ea0bfa352 Mon Sep 17 00:00:00 2001 From: Ben Woodhead Date: Mon, 2 Apr 2012 10:49:44 -0300 Subject: [PATCH 1/2] Added error reporting for when an ingest fails --- ContentModel.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ContentModel.inc b/ContentModel.inc index 444f485c..be362c70 100644 --- 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; } } From 860069f40042dcb14f150e259b87e9b9f91f4bb2 Mon Sep 17 00:00:00 2001 From: Ben Woodhead Date: Mon, 2 Apr 2012 11:56:08 -0300 Subject: [PATCH 2/2] Cleaned up error handling --- api/fedora_item.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api/fedora_item.inc b/api/fedora_item.inc index 2809f384..e6477915 100644 --- 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);