Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Fixing derivatives hook spelling error

pull/602/head
Kylea Jackson 10 years ago
parent
0fabd10b5c
commit
c135fd92f2
4 changed files with 9 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      includes/delete_datastream.form.inc
  2. 4
      includes/derivatives.inc
  3. 2
      includes/object_properties.form.inc
  4. 3
      islandora.module

8
includes/delete_datastream.form.inc
Unescape View File

@ -22,7 +22,6 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
// XXX: Stashed version of datastream is deprecated... Use object and // XXX: Stashed version of datastream is deprecated... Use object and
// datastream IDs from 'datastream_info' to acquire. // datastream IDs from 'datastream_info' to acquire.
$form_state['datastream'] = $datastream; $form_state['datastream'] = $datastream;
$form_state['datastream_info'] = array( $form_state['datastream_info'] = array(
'object_id' => $datastream->parent->id, 'object_id' => $datastream->parent->id,
'datastream_id' => $datastream->id, 'datastream_id' => $datastream->id,
@ -32,10 +31,10 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
$dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid)); $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid));
$dsids = array_unique($dsids); $dsids = array_unique($dsids);
$form['delete_derivatives'] = array( $form['delete_derivatives'] = array(
'#title' => t('Delete Derviatives'), '#title' => t('Delete Derivatives'),
'#type' => 'checkbox', '#type' => 'checkbox',
'#default_value' => 0, '#default_value' => 0,
'#description' => t('Derivatives can be regenerated at a later time.'), '#description' => t('Derivatives can be regenerated at a later time.'),
); );
$form['base_info'] = array( $form['base_info'] = array(
'#type' => 'item', '#type' => 'item',
@ -72,7 +71,7 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr
*/ */
function islandora_datastream_to_purge(AbstractObject $object, $dsid) { function islandora_datastream_to_purge(AbstractObject $object, $dsid) {
module_load_include('inc', 'islandora', 'includes/utilities'); module_load_include('inc', 'islandora', 'includes/utilities');
$hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
$hook_filter = function ($hook_def) use ($dsid) { $hook_filter = function ($hook_def) use ($dsid) {
return isset($hook_def['source_dsid']) && isset($hook_def['destination_dsid']) ? return isset($hook_def['source_dsid']) && isset($hook_def['destination_dsid']) ?
$hook_def['source_dsid'] == $dsid : $hook_def['source_dsid'] == $dsid :
@ -119,7 +118,6 @@ function islandora_delete_datastream_form_submit(array $form, array &$form_state
$object = islandora_object_load($form_state['datastream_info']['object_id']); $object = islandora_object_load($form_state['datastream_info']['object_id']);
$datastream_id = $form_state['datastream_info']['datastream_id']; $datastream_id = $form_state['datastream_info']['datastream_id'];
$datastream = $object[$datastream_id]; $datastream = $object[$datastream_id];
$deleted = FALSE; $deleted = FALSE;
if ($form_state['values']['delete_derivatives']) { if ($form_state['values']['delete_derivatives']) {
islandora_datastream_derivatives_purged($object, $datastream_id); islandora_datastream_derivatives_purged($object, $datastream_id);

4
includes/derivatives.inc
Unescape View File

@ -83,7 +83,7 @@ function islandora_do_derivatives(AbstractObject $object, array $options) {
$options += array( $options += array(
'force' => FALSE, 'force' => FALSE,
); );
$hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
uasort($hooks, 'drupal_sort_weight'); uasort($hooks, 'drupal_sort_weight');
$results = array(); $results = array();
$hooks = islandora_filter_derivatives($hooks, $options, $object); $hooks = islandora_filter_derivatives($hooks, $options, $object);
@ -176,7 +176,7 @@ function islandora_do_batch_derivatives(AbstractObject $object, array $options)
$options += array( $options += array(
'force' => FALSE, 'force' => FALSE,
); );
$hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
uasort($hooks, 'drupal_sort_weight'); uasort($hooks, 'drupal_sort_weight');
$operations = array(); $operations = array();

2
includes/object_properties.form.inc
Unescape View File

@ -29,7 +29,7 @@ function islandora_object_properties_form(array $form, array &$form_state, Abstr
$regenerate_derivatives_access = FALSE; $regenerate_derivatives_access = FALSE;
if (islandora_object_access(ISLANDORA_REGENERATE_DERIVATIVES, $object)) { if (islandora_object_access(ISLANDORA_REGENERATE_DERIVATIVES, $object)) {
module_load_include('inc', 'islandora', 'includes/derivatives'); module_load_include('inc', 'islandora', 'includes/derivatives');
$hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object));
$hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object); $hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object);
if (count($hooks) >= 1) { if (count($hooks) >= 1) {
$regenerate_derivatives_access = TRUE; $regenerate_derivatives_access = TRUE;

3
islandora.module
Unescape View File

@ -58,7 +58,10 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested');
define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified'); define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified');
define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged'); define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged');
define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps'); define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps');
// The "ISLANDORA_DERVIATIVE_CREATION_HOOK" constant has deprecated as of
// 7.x-1.5, and should be removed after the next release.
define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative'); define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative');
define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative');
// Autocomplete paths. // Autocomplete paths.
define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models'); define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models');

Write Preview
Loading…
Cancel
Save