merge command fail fix

includes/derivatives.inc

@@ -71,7 +71,7 @@ function islandora_do_derivatives(AbstractObject $object, array $options) {
     }
     foreach ($hook['function'] as $function) {
       if (function_exists($function)) {
-        $logging = call_user_func($function, $object, $options['force']);
+        $logging = call_user_func($function, $object, $options['force'], $hook);
         if (!empty($logging)) {
           $results[] = $logging;
         }
@@ -164,11 +164,15 @@ function islandora_do_batch_derivatives(AbstractObject $object, array $options)
       $file = $hook['file'];
     }
     foreach ($hook['function'] as $function) {
-      $operations[] = array('islandora_derivative_perform_batch_operation', array(
+      $operations[] = array(
-        $function,
+        'islandora_derivative_perform_batch_operation',
-        $file,
+        array(
-        $object->id,
+          $function,
-        $options['force']),
+          $file,
+          $object->id,
+          $options['force'],
+          $hook,
+        ),
       );
     }
   }

includes/ingest.form.inc

@@ -467,12 +467,14 @@ function islandora_ingest_form_undo_consecutive_callback_steps(array $form, arra
  *   The step which the undo callback is being called on.
  */
 function islandora_ingest_form_undo_callback_step(array $form, array &$form_state, array $step) {
-  $args = array(&$form_state);
+  if (isset($step['undo_function'])) {
-  $args = isset($step['undo_function']['args']) ? array_merge($args, $step['undo_function']['args']) : $args;
+    $args = array(&$form_state);
-  if (isset($step['undo_function']['file'])) {
+    $args = isset($step['undo_function']['args']) ? array_merge($args, $step['undo_function']['args']) : $args;
-    require_once drupal_get_path('module', $step['module']) . "/" . $step['undo_function']['file'];
+    if (isset($step['undo_function']['file'])) {
+      require_once drupal_get_path('module', $step['module']) . "/" . $step['undo_function']['file'];
+    }
+    call_user_func_array($step['undo_function']['function'], $args);
   }
-  call_user_func_array($step['undo_function']['function'], $args);
 }
 
 /**
@@ -769,7 +771,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
     islandora_ingest_form_execute_consecutive_callback_steps($form, $form_state, $step);
   }
   // Ingest the objects.
-  $set_redirect = TRUE;
+  $set_redirect = isset($form_state['redirect']) ? FALSE : TRUE;
   foreach ($form_state['islandora']['objects'] as &$object) {
     try {
       islandora_add_object($object);

includes/regenerate_derivatives.form.inc

@@ -142,15 +142,17 @@ function islandora_regenerate_datastream_derivative_batch(AbstractDatastream $da
  *   The pid of the object we are performing.
  * @param bool $force
  *   Whether we are forcing derivative regeneration or not.
+ * @param array $hook
+ *   The derivative definition.
  * @param array $context
  *   The context of the current batch operation.
  */
-function islandora_derivative_perform_batch_operation($function, $file, $pid, $force, &$context) {
+function islandora_derivative_perform_batch_operation($function, $file, $pid, $force, $hook, &$context) {
   if ($file) {
     require_once $file;
   }
   if (function_exists($function)) {
-    $logging = call_user_func($function, islandora_object_load($pid), $force);
+    $logging = call_user_func($function, islandora_object_load($pid), $force, $hook);
     if (!empty($logging)) {
       $context['results']['logging'][] = $logging;
     }

includes/tuque_wrapper.inc

@@ -115,6 +115,10 @@ class IslandoraFedoraRepository extends FedoraRepository {
       foreach ($object as $dsid => $datastream) {
         islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_INGESTED_HOOK, $object->models, $dsid, $object, $datastream);
       }
+      // Fire of event if rules is enabled.
+      if (module_exists('rules')) {
+        rules_invoke_event('islandora_object_ingested', $object);
+      }
       return $ret;
     }
     catch (Exception $e) {

islandora.api.php

@@ -423,13 +423,13 @@ function hook_islandora_undeletable_datastreams(array $models) {
  *   - form_id: The form building function to call to get the form structure
  *     for this step.
  *   - args: An array of arguments to pass to the form building function.
- *   Required "callback" type specific parameters:
+ *   "Callback" type specific parameters:
- *   - do_function: An associate array including:
+ *   - do_function: A required associative array including:
  *       - 'function': The callback function to be called.
  *       - 'args': An array of arguments to pass to the callback function.
  *       - 'file': A file to include (relative to the module's path, including
  *          the file's extension).
- *   - undo_function: An associate array including:
+ *   - undo_function: An optional associative array including:
  *       - 'function': The callback function to be called to reverse the
  *          executed action in the ingest steps.
  *       - 'args': An array of arguments to pass to the callback function.
@@ -638,7 +638,7 @@ function hook_CMODEL_PID_islandora_overview_object_alter(AbstractObject &$object
  *   - function: An array of function(s) to be ran when constructing
  *     derivatives. Functions that are defined to be called for derivation
  *     creation must have the following structure:
- *     module_name_derivative_creation_function($object, $force = FALSE)
+ *     module_name_derivative_creation_function($object, $force = FALSE, $hook)
  *     These functions must return an array in the structure of:
  *     - success: Bool denoting whether the operation was successful.
  *     - messages: An array structure containing zero or more array's with the

islandora.module

@@ -109,13 +109,35 @@ function islandora_menu() {
     'file' => 'includes/metadata.inc',
     'access arguments' => array('administer site configuration'),
   );
-  $items['admin/islandora/solution_packs'] = array(
+  $items['admin/islandora/solution_pack_config'] = array(
-    'title' => 'Solution packs',
+    'title' => 'Solution pack configuration',
+    'description' => 'Configure Islandora solution packs.',
+    'access callback' => 'islandora_find_package',
+    'access arguments' => array('Islandora Solution Packs'),
+    'type' => MENU_NORMAL_ITEM,
+  );
+  $items['admin/islandora/islandora_viewers'] = array(
+    'title' => 'Islandora Viewers',
+    'description' => 'Configure custom viewers.',
+    'access callback' => 'islandora_find_package',
+    'access arguments' => array('Islandora Viewers'),
+    'type' => MENU_NORMAL_ITEM,
+  );
+  $items['admin/islandora/islandora_utilities'] = array(
+    'title' => 'Islandora Utility Modules',
+    'description' => 'Configure Islandora utility modules.',
+    'access callback' => 'islandora_find_package',
+    'access arguments' => array('Islandora Utilities'),
+    'type' => MENU_NORMAL_ITEM,
+  );
+  $items['admin/islandora/solution_pack_config/solution_packs'] = array(
+    'title' => 'Solution packs required objects',
     'description' => 'Install content models and collections required by installed solution packs.',
     'page callback' => 'islandora_solution_packs_admin',
     'access arguments' => array(ISLANDORA_ADD_DS),
     'file' => 'includes/solution_packs.inc',
     'type' => MENU_NORMAL_ITEM,
+    'weight' => -1,
   );
   $items['islandora'] = array(
     'title' => 'Islandora Repository',
@@ -1531,6 +1553,11 @@ function islandora_entity_property_info() {
     'label' => t('Content Models'),
     'description' => t('The list of content models which the object has.'),
   );
+  $p['createdDate'] = array(
+    'type' => 'text',
+    'label' => t('Created Date'),
+    'description' => t('When the object was created.'),
+  );
 
   return $info;
 }
@@ -1819,9 +1846,9 @@ function islandora_repair_drupal_filter() {
   }
 }
 
- /**
+/**
-  * Implements hook_islandora_metadata_display_info().
+ * Implements hook_islandora_metadata_display_info().
-  */
+ */
 function islandora_islandora_metadata_display_info() {
   return array(
     'dublin_core' => array(
@@ -1858,3 +1885,24 @@ function islandora_islandora_datastream_access($op, AbstractDatastream $datastre
   }
   return $result;
 }
+
+/**
+ * Access for submenu items.
+ *
+ * @param string $package_name
+ *   Name of the package
+ *
+ * @return bool
+ *   Access granted
+ */
+function islandora_find_package($package_name) {
+  $results = system_get_info('module');
+  $found = FALSE;
+  foreach ($results as $name => $values) {
+    if ($values['package'] == $package_name) {
+      $found = TRUE;
+      break;
+    }
+  }
+  return $found && user_access('administer site configuration');
+}

islandora.rules.inc

@@ -5,11 +5,30 @@
  * Does rule type stuff,
  */
 
+/**
+ * Implements hook_rules_event_info().
+ */
+function islandora_rules_event_info() {
+  return array(
+    'islandora_object_ingested' => array(
+      'group' => t('Islandora'),
+      'label' => t('Object ingested'),
+      'variables' => array(
+        'object' => array(
+          'type' => 'islandora_object',
+          'label' => t('The ingested object'),
+          'description' => t('A Tuque object for the ingested Fedora object, as an entity.'),
+        ),
+      ),
+    ),
+  );
+}
+
 /**
  * Helper function to get reused "parameter" array.
  */
 function islandora_rules_relationship_parameter_array() {
-  $to_return = array(
+  return array(
     'subject' => array(
       'type' => 'islandora_object',
       'label' => t('Subject'),
@@ -39,8 +58,6 @@ function islandora_rules_relationship_parameter_array() {
       'default value' => 0,
     ),
   );
-
-  return $to_return;
 }
 
 /**

islandora.rules_defaults.inc

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Implementation of Rules hooks, giving default configurations.
+ */
+
+/**
+ * Implements hook_default_rules_configuration().
+ */
+function islandora_default_rules_configuration() {
+  $rule = rules_reaction_rule();
+  $rule->label = 'E-mail admin';
+  $rule->active = FALSE;
+  $rule
+    ->event('islandora_object_ingested')
+    ->action(
+      'mail',
+      array(
+        'to' => '[site:mail]',
+        'subject' => '[[site:name]] "[object:label]" has been ingested',
+        'message' => '[object:label] has been ingested as [object:id].',
+      )
+    );
+  return array('islandora_object_ingested_notify_admin' => $rule);
+}

tests/scripts/travis_setup.sh

@@ -14,12 +14,11 @@ export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadin
 cd $HOME
 pear upgrade --force Console_Getopt
 pear upgrade --force pear
-pear upgrade-all
 pear channel-discover pear.drush.org
 pear channel-discover pear.drush.org
 pear channel-discover pear.phpqatools.org
 pear channel-discover pear.netpirates.net
-pear install pear/PHP_CodeSniffer-1.4.8
+pear install pear/PHP_CodeSniffer
 pear install pear.phpunit.de/phpcpd
 
 # Install Drush

theme/islandora-object.tpl.php

@@ -61,13 +61,13 @@
 <div class="islandora-object islandora">
   <h2><?php print t('Details'); ?></h2>
 
-  <dl class="islandora-object-tn">
+  <?php if (isset($variables['islandora_thumbnail_url'])): ?>
-    <dt>
+    <dl class="islandora-object-tn">
-      <?php if (isset($variables['islandora_thumbnail_url'])): ?>
+      <dt>
-        <img src="<?php print $variables['islandora_thumbnail_url']; ?>"/></dt>
+        <img src="<?php print $variables['islandora_thumbnail_url']; ?>"/>
-      <?php endif; ?>
+      </dt>
-    <dd></dd>
+    </dl>
-  </dl>
+  <?php endif; ?>
   <div class="islandora-default-metadata">
     <?php print $description; ?>
     <?php print $metadata; ?>