From d2ecd81ba8ac8999d705184b26399fb992e77159 Mon Sep 17 00:00:00 2001
From: MorganDawe <mdawe@discoverygarden.ca>
Date: Tue, 2 Sep 2014 16:19:42 -0300
Subject: [PATCH] Code review feedback.

---
 includes/datastream.inc     |  2 +-
 includes/mimetype.utils.inc | 31 +++++++++++++++++++++++++++++++
 includes/utilities.inc      | 24 ------------------------
 3 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 includes/mimetype.utils.inc

diff --git a/includes/datastream.inc b/includes/datastream.inc
index 5f48211c..592870b7 100644
--- a/includes/datastream.inc
+++ b/includes/datastream.inc
@@ -30,7 +30,7 @@ function islandora_download_datastream(AbstractDatastream $datastream) {
  *   The version of the datastream to display
  */
 function islandora_view_datastream(AbstractDatastream $datastream, $download = FALSE, $version = NULL) {
-  module_load_include('inc', 'islandora', 'includes/utilities');
+  module_load_include('inc', 'islandora', 'includes/mimetype.utils');
   // XXX: Certain features of the Devel module rely on the use of "shutdown
   // handlers", such as query logging... The problem is that they might blindly
   // add additional output which will break things if what is actually being
diff --git a/includes/mimetype.utils.inc b/includes/mimetype.utils.inc
new file mode 100644
index 00000000..989c55cd
--- /dev/null
+++ b/includes/mimetype.utils.inc
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @file
+ * Mimetype specific utility functions.
+ */
+
+/**
+ * Retrieve the correct file extension for a give mimetype.
+ *
+ * @param string $mimetype
+ *   The mimetype whose extension is required.
+ *
+ * @return string
+ *   The extension mapped to the given mimetype.
+ */
+function islandora_get_extension_for_mimetype($mimetype) {
+  // file.mimetypes.inc is a part of Drupal core, however is not
+  // automatically loaded. Manually require it.
+  require_once DRUPAL_ROOT . "/includes/file.mimetypes.inc";
+
+  $mimetype_mapping = file_mimetype_mapping();
+  $extension_index = array_search($mimetype, $mimetype_mapping['mimetypes']);
+  $mime_array_flipped = array_reverse($mimetype_mapping['extensions']);
+  $extension = array_search($extension_index, $mime_array_flipped);
+
+  // We can only have one mapping in drupal for 'xml'.
+  if ($mimetype == "text/xml") {
+    return "xml";
+  }
+  return $extension;
+}
diff --git a/includes/utilities.inc b/includes/utilities.inc
index d3d2bbc3..26633df5 100644
--- a/includes/utilities.inc
+++ b/includes/utilities.inc
@@ -46,30 +46,6 @@ function islandora_convert_bytes_to_human_readable($bytes, $precision = 2) {
   }
 }
 
-/**
- * Retrieve the correct file extension for a give mimetype.
- *
- * @param string $mimetype
- *   The mimetype whose extension is required.
- *
- * @return string
- *   The extension mapped to the given mimetype.
- */
-function islandora_get_extension_for_mimetype($mimetype) {
-  require_once DRUPAL_ROOT . "/includes/file.mimetypes.inc";
-
-  $mimetype_mapping = file_mimetype_mapping();
-  $extension_index = array_search($mimetype, $mimetype_mapping['mimetypes']);
-  $mime_array_flipped = array_reverse($mimetype_mapping['extensions']);
-  $extension = array_search($extension_index, $mime_array_flipped);
-
-  // We can only have one mapping in drupal for 'xml'.
-  if ($mimetype == "text/xml") {
-    return "xml";
-  }
-  return $extension;
-}
-
 /**
  * Add a file as managed if is not already.
  *