From fc33e520e20cbba74e6360720a94977565beb65b Mon Sep 17 00:00:00 2001 From: yqjiang Date: Fri, 18 Oct 2013 13:03:49 +0000 Subject: [PATCH] recover islandora 7.x --- includes/ingest.form.inc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc index d0af2084..20e05497 100644 --- a/includes/ingest.form.inc +++ b/includes/ingest.form.inc @@ -57,6 +57,11 @@ function islandora_ingest_form(array $form, array &$form_state, array $configura return islandora_ingest_form_execute_step($form, $form_state); } catch (Exception $e) { + watchdog( + 'islandora', + 'Exception during ingest form processing with Message: "@exception", and Trace: @trace', + array('@exception' => $e->getMessage(), '@trace' => $e->getTraceAsString()), WATCHDOG_ERROR + ); drupal_set_message($e->getMessage(), 'error'); return array(array( '#markup' => l(t('Back'), 'javascript:window.history.back();', array('external' => TRUE)))); @@ -774,8 +779,17 @@ function islandora_ingest_form_submit(array $form, array &$form_state) { catch (Exception $e) { // If post hooks throws it may already exist at this point but may be // invalid, so don't say failed. - watchdog('islandora', 'Exception Message: @exception.', array('@exception' => $e->getMessage()), WATCHDOG_ERROR); - drupal_set_message(t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error'); + watchdog( + 'islandora', + 'Exception during ingest with Message: "@exception", and Trace: @trace', + array('@exception' => $e->getMessage(), '@trace' => $e->getTraceAsString()), + WATCHDOG_ERROR + ); + drupal_set_message( + t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', + array('@label' => $object->label, '@pid' => $object->id)), + 'error' + ); } } // XXX: Foreaching with references can be weird... The reference exists in