Browse Source

forgot add this file

pull/420/head
yqjiang 11 years ago
parent
commit
0acac35847
  1. 19
      includes/ingest.form.inc

19
includes/ingest.form.inc

@ -57,12 +57,6 @@ function islandora_ingest_form(array $form, array &$form_state, array $configura
return islandora_ingest_form_execute_step($form, $form_state); return islandora_ingest_form_execute_step($form, $form_state);
} }
catch (Exception $e) { 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'); drupal_set_message($e->getMessage(), 'error');
return array(array( return array(array(
'#markup' => l(t('Back'), 'javascript:window.history.back();', array('external' => TRUE)))); '#markup' => l(t('Back'), 'javascript:window.history.back();', array('external' => TRUE))));
@ -777,17 +771,8 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
catch (Exception $e) { catch (Exception $e) {
// If post hooks throws it may already exist at this point but may be // If post hooks throws it may already exist at this point but may be
// invalid, so don't say failed. // invalid, so don't say failed.
watchdog( watchdog('islandora', 'Exception Message: @exception.', array('@exception' => $e->getMessage()), WATCHDOG_ERROR);
'islandora', drupal_set_message(t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), 'error');
'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 // XXX: Foreaching with references can be weird... The reference exists in

Loading…
Cancel
Save