Browse Source

Use references when ingesting during steps.

Makes the objects available to later submission handlers...  Handling a
weird case, yes...  Need to trigger something only after ingest, but
only when ingesting through the form.
pull/361/head
Adam Vessey 12 years ago
parent
commit
4bcb99ddcb
  1. 5
      includes/ingest.form.inc

5
includes/ingest.form.inc

@ -703,7 +703,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
islandora_ingest_form_execute_consecutive_callback_steps($form, $form_state, $step); islandora_ingest_form_execute_consecutive_callback_steps($form, $form_state, $step);
} }
// Ingest the objects. // Ingest the objects.
foreach ($form_state['islandora']['objects'] as $object) { foreach ($form_state['islandora']['objects'] as &$object) {
try { try {
islandora_add_object($object); islandora_add_object($object);
$form_state['redirect'] = "islandora/object/{$object->id}"; $form_state['redirect'] = "islandora/object/{$object->id}";
@ -715,6 +715,9 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
drupal_set_message(t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.', array('@label' => $object->label, '@pid' => $object->id)), '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
// the scope outside.
unset($object);
} }
/** /**

Loading…
Cancel
Save