Merge pull request #525 from willtp87/7.x.deprecation

Removing deprecated function islandor_get_comp_ds_mappings.

includes/utilities.inc

@@ -649,54 +649,6 @@ function islandora_system_settings_form_default_value($name, $default_value, arr
   return isset($form_state['values'][$name]) ? $form_state['values'][$name] : variable_get($name, $default_value);
 }
 
-/**
- * Returns basic information about DS-COMPOSITE-MODEL.
- *
- * @deprecated
- *   The pre-existing--and more flexible--
- *   islandora_get_datastreams_requirements_from_content_model() should be
- *   preferred, as it addresses the case where a stream can be allowed to have
- *   one of a set of mimetypes (this functions appears to only return the last
- *   declared mimetype for a given datastream).
- *
- * @param string $pid
- *   The PID of content model containing DS_COMP stream.
- *
- * @return array
- *   An associative array mapping datastream IDs to an associative array
- *   representing the parsed DS-COMPOSITE-MODEL of the form:
- *   - DSID: A string containing the datastream ID.
- *     - "mimetype": A string containing the last mimetype declared for the
- *       given datastream ID.
- *     - "optional": An optional boolean indicating that the given datastream
- *       is optional.
- */
-function islandora_get_comp_ds_mappings($pid) {
-  $message = islandora_deprecated('7.x-1.2', t('Refactor to use the more flexible islandora_get_datastreams_requirements_from_content_model().'));
-  trigger_error(filter_xss($message), E_USER_DEPRECATED);
-
-  $cm_object = islandora_object_load($pid);
-  if (!isset($cm_object) || !isset($cm_object['DS-COMPOSITE-MODEL'])) {
-    return FALSE;
-  }
-  $datastream = $cm_object['DS-COMPOSITE-MODEL'];
-  $ds_comp_stream = $datastream->content;
-  $sxml = new SimpleXMLElement($ds_comp_stream);
-  $mappings = array();
-  foreach ($sxml->dsTypeModel as $ds) {
-    $dsid = (string) $ds['ID'];
-    $optional = (string) $ds['optional'];
-    foreach ($ds->form as $form) {
-      $mime = (string) $form['MIME'];
-      if ($optional) {
-        $mappings[$dsid]['optional'] = $optional;
-      }
-      $mappings[$dsid]['mimetype'] = $mime;
-    }
-  }
-  return $mappings;
-}
-
 /**
  * Checks that the given/current account has all the given permissions.
  *