From 32f2f7d75397d0d146419ccbd1e174bfc60d876b Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Thu, 28 Jun 2012 16:35:36 -0400
Subject: [PATCH 01/10] sketching out fits support

---
 plugins/fits.inc | 85 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 plugins/fits.inc

diff --git a/plugins/fits.inc b/plugins/fits.inc
new file mode 100644
index 00000000..1de5a559
--- /dev/null
+++ b/plugins/fits.inc
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Fits
+ * fits.sh must be in the apache user's path
+ */
+
+/**
+ * This Class implements the methods defined in the STANDARD_IMAGE content model
+ */
+class fits {
+
+  private $pid = NULL;
+  private $item = NULL;
+
+  /**
+   * Constructor
+   * @param type $pid
+   */
+  function __construct($pid) {
+    //drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    $this->pid = $pid;
+    module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+    $this->item = new Fedora_Item($this->pid);
+  }
+
+  /**
+   * extract metadata
+   * @param type $parameterArray
+   * @param type $dsid
+   * @param type $file
+   * @param type $file_ext
+   * @return type
+   */
+  function extractMetadata($parameterArray, $dsid, $file, $file_ext) {
+    $system = getenv('System');
+    $file_suffix = '_' . $dsid . '.xml';
+    $returnValue = TRUE;
+    $output = array();
+    exec('fits ' . escapeshellarg($file) . '', $output);
+    file_put_contents($file . $file_suffix, implode("\n", $output));
+    $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix;
+    return TRUE;
+  }
+
+  /**
+   * display metadata
+   * @return type
+   */
+  function displayMetadata() {
+    $output = '';
+    $exif = $this->item->get_datastream_dissemination('FITS');
+    if (trim($exif) != '') {
+      $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
+      if ($exifDom != NULL) {
+        $description = $exifDom->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'Description');
+        if ($description->length > 0) {
+          $description = $description->item(0);
+          $output .= '<div class="fedora_technical_metadata"><ul>';
+          for ($i = 0; $i < $description->childNodes->length; $i++) {
+            $name = $description->childNodes->item($i)->nodeName;
+            $value = $description->childNodes->item($i)->nodeValue;
+            if ($name != '#text' && !preg_match('/^System\:.*$/', $name) && trim($value) != '') {
+              list($type, $name) = preg_split('/\:/', $name);
+              $name = trim(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[A-Z])/', " $1", $name));
+              $output .= '<li><b>' . $name . '</b>:  ' . $value . ' </li>';
+            }
+          }
+          $output .= '</ul></div>';
+
+          $fieldset = array(
+            '#title' => t("!text", array('!text' => 'FITS Technical Metadata')),
+            '#collapsible' => TRUE,
+            '#collapsed' => TRUE,
+            '#value' => $output
+          );
+          $output = theme('fieldset', $fieldset);
+        }
+      }
+    }
+    return $output;
+  }
+
+}

From a0e8b599003e7efe13192da07156371d317706f9 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Thu, 19 Jul 2012 12:20:59 -0400
Subject: [PATCH 02/10] ready to test

---
 plugins/fits.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index 1de5a559..abc9074f 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -38,7 +38,7 @@ class fits {
     $file_suffix = '_' . $dsid . '.xml';
     $returnValue = TRUE;
     $output = array();
-    exec('fits ' . escapeshellarg($file) . '', $output);
+    exec('fits.sh -h' . escapeshellarg($file) . '', $output);
     file_put_contents($file . $file_suffix, implode("\n", $output));
     $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix;
     return TRUE;
@@ -50,11 +50,11 @@ class fits {
    */
   function displayMetadata() {
     $output = '';
-    $exif = $this->item->get_datastream_dissemination('FITS');
-    if (trim($exif) != '') {
-      $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
-      if ($exifDom != NULL) {
-        $description = $exifDom->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'Description');
+    $fits = $this->item->get_datastream_dissemination('FITS');
+    if (trim($fits) != '') {
+      $fitsDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
+      if ($fitsDom != NULL) {
+        $description = $fitsDom->getElementsByTagNameNS('http://hul.harvard.edu/ois/xml/ns/fits/fits_output', 'fits');
         if ($description->length > 0) {
           $description = $description->item(0);
           $output .= '<div class="fedora_technical_metadata"><ul>';

From ceb50f531b97ad40ad882340e3c602a7b5149f35 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Fri, 3 Aug 2012 14:54:50 -0400
Subject: [PATCH 03/10] fits plugin

---
 plugins/fits.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index 1de5a559..d8a04381 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -33,12 +33,12 @@ class fits {
    * @param type $file_ext
    * @return type
    */
-  function extractMetadata($parameterArray, $dsid, $file, $file_ext) {
+  function extractFits($parameterArray, $dsid, $file, $file_ext) {
     $system = getenv('System');
     $file_suffix = '_' . $dsid . '.xml';
     $returnValue = TRUE;
     $output = array();
-    exec('fits ' . escapeshellarg($file) . '', $output);
+    exec('fits.sh -i ' . escapeshellarg($file) . '', $output);
     file_put_contents($file . $file_suffix, implode("\n", $output));
     $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix;
     return TRUE;
@@ -48,13 +48,13 @@ class fits {
    * display metadata
    * @return type
    */
-  function displayMetadata() {
+  function displayFits() {
     $output = '';
     $exif = $this->item->get_datastream_dissemination('FITS');
     if (trim($exif) != '') {
       $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
       if ($exifDom != NULL) {
-        $description = $exifDom->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'Description');
+        $description = $exifDom->getElementsByTagName('fits');
         if ($description->length > 0) {
           $description = $description->item(0);
           $output .= '<div class="fedora_technical_metadata"><ul>';

From 51a8a8343fbec50f89c396125b4662ed9f5c75ce Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Fri, 3 Aug 2012 16:00:16 -0400
Subject: [PATCH 04/10] aping the Exiftool class in audio_sp.inc

---
 plugins/fits.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index ef4cf35d..3207c7b3 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -18,11 +18,12 @@ class fits {
    * Constructor
    * @param type $pid
    */
-  function __construct($pid) {
-    //drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-    $this->pid = $pid;
+  function __construct($pid = NULL) {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-    $this->item = new Fedora_Item($this->pid);
+    if (!empty($pid)) {
+      $this->pid = $pid;
+      $this->item = new Fedora_Item($this->pid);
+    }
   }
 
   /**
@@ -34,7 +35,6 @@ class fits {
    * @return type
    */
   function extractFits($parameterArray, $dsid, $file, $file_ext) {
-    $system = getenv('System');
     $file_suffix = '_' . $dsid . '.xml';
     $returnValue = TRUE;
     $output = array();

From 4e647fa39a0d34c6395acb09a21fb47a31b6e8fb Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Fri, 3 Aug 2012 16:32:07 -0400
Subject: [PATCH 05/10] get rid of the potential to create links to files that
 don't exist - thanks @mmccollow

---
 plugins/fits.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index 3207c7b3..b7e30aee 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -36,10 +36,11 @@ class fits {
    */
   function extractFits($parameterArray, $dsid, $file, $file_ext) {
     $file_suffix = '_' . $dsid . '.xml';
-    $returnValue = TRUE;
     $output = array();
     exec('fits.sh -i ' . escapeshellarg($file) . '', $output);
-    file_put_contents($file . $file_suffix, implode("\n", $output));
+    if ( !file_put_contents($file . $file_suffix, implode("\n", $output)) ) {
+        exit("Error writing file: ". $file_name);
+    }
     $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix;
     return TRUE;
   }

From c11a68b45d7838364c7b4733373b99b7c73cb4d8 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Fri, 3 Aug 2012 16:37:14 -0400
Subject: [PATCH 06/10] stupid late friday typos

---
 plugins/fits.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index b7e30aee..bebb0a81 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -35,13 +35,13 @@ class fits {
    * @return type
    */
   function extractFits($parameterArray, $dsid, $file, $file_ext) {
-    $file_suffix = '_' . $dsid . '.xml';
+    $file_name = '_' . $dsid . '.xml';
     $output = array();
     exec('fits.sh -i ' . escapeshellarg($file) . '', $output);
-    if ( !file_put_contents($file . $file_suffix, implode("\n", $output)) ) {
+    if ( !file_put_contents($file . $file_name, implode("\n", $output)) ) {
         exit("Error writing file: ". $file_name);
     }
-    $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix;
+    $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_name;
     return TRUE;
   }
 

From 9dedcb527942353b3a4028116b0ead5809cf1d05 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Wed, 8 Aug 2012 14:40:21 -0400
Subject: [PATCH 07/10] installing fits, and adding it to path comments

---
 plugins/fits.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index bebb0a81..4c20946b 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -4,6 +4,12 @@
  * @file
  * Fits
  * fits.sh must be in the apache user's path
+ *
+ * Download FITS from http://code.google.com/p/fits/
+ * Installing: http://code.google.com/p/fits/wiki/installing
+ * Edit line 5 in fits.sh (FITS_HOME='') and give it a home.
+ * Make sure that home is in the apache user's path.
+ *
  */
 
 /**

From 5d95a7c30f1d29f7b99f249d4f2f38dd9b41c855 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Mon, 13 Aug 2012 13:42:19 -0400
Subject: [PATCH 08/10] fulfilling request for config options for FITS support
 in ISLANDORA-680

---
 formClass.inc    | 106 +++++++++++++++++++++++++++--------------------
 plugins/fits.inc |  16 +++----
 2 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/formClass.inc b/formClass.inc
index 5184cf78..57de2819 100644
--- a/formClass.inc
+++ b/formClass.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * formClass class
@@ -18,7 +16,7 @@ class formClass {
 
   /**
    * Create the paths for urls and map them to php functions
-   * @return array 
+   * @return array
    */
   function createMenu() {
     $items = array();
@@ -87,42 +85,42 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('view fedora collection')
     );
-    
+
     $items['fedora/repository/editmetadata'] = array(
       'title' => t('Edit metadata'),
       'page callback' => 'fedora_repository_edit_qdc_page',
       'type' => MENU_CALLBACK,
       'access arguments' => array('edit fedora meta data')
     );
-    
+
     $items['fedora/repository/purgeStream'] = array(
       'title' => t('Purge data stream'),
       'page callback' => 'fedora_repository_purge_stream',
       'type' => MENU_CALLBACK,
       'access arguments' => array('purge objects and datastreams')
     );
-    
+
     $items['fedora/repository/replaceStream'] = array(
       'title' => t('Replace Stream'),
       'page callback' => 'fedora_repository_replace_stream',
       'type' => MENU_CALLBACK,
       'access arguments' => array('add fedora datastreams'),
     );
-    
+
     $items['fedora/repository/purgeObject'] = array(
       'title' => t('Purge object'),
       'page callback' => 'fedora_repository_purge_object',
       'type' => MENU_CALLBACK,
       'access arguments' => array('purge objects and datastreams')
     );
-    
+
     $items['fedora/repository/addStream'] = array(
       'title' => t('Add stream'),
       'page callback' => 'add_stream',
       'type' => MENU_CALLBACK,
       'access arguments' => array('add fedora datastreams')
     );
-    
+
     //new for mnpl******************************************
     $items['fedora/repository/mnpl_advanced_search'] = array(
       'title' => t('Repository advanced search'),
@@ -130,7 +128,7 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('view fedora collection')
     );
-    
+
     $items['fedora/ingestObject'] = array(
       'title' => t('Ingest object'),
       'page callback' => 'fedora_repository_ingest_object',
@@ -194,7 +192,7 @@ class formClass {
 
   /**
    * Create admin form
-   * @return array 
+   * @return array
    */
   function createAdminForm() {
     if (!user_access('administer site configuration')) {
@@ -221,7 +219,7 @@ class formClass {
       '#required' => TRUE,
       '#weight' => -16,
     );
-    
+
 
     $form['fedora_repository_url'] = array(
       '#type' => 'textfield',
@@ -230,7 +228,7 @@ class formClass {
       '#description' => t('The url of the Fedora server'), '#required' => TRUE,
       '#weight' => -14
     );
-    
+
     $form['fedora_soap_url'] = array(
       '#type' => 'textfield',
       '#title' => t('Fedora SOAP Url'),
@@ -239,7 +237,7 @@ class formClass {
       '#required' => TRUE,
       '#weight' => -12,
       '#suffix' => '<p>' . (
-        fedora_available() ? 
+        fedora_available() ?
           theme('image', 'misc/watchdog-ok.png') . t('Successfully connected to Fedora server at @fedora_soap_url', array('@fedora_soap_url' => variable_get('fedora_soap_url', ''))) :
           theme('image', 'misc/watchdog-error.png') . t('Unable to connect to Fedora server at @fedora_soap_url', array('@fedora_soap_url' => variable_get('fedora_soap_url', '')))) . '</p>',
     );
@@ -347,7 +345,7 @@ class formClass {
       '#default_value' => variable_get('fedora_object_restrict_datastreams', FALSE),
       '#description' => t('When enabled, restricts access to fedora object datastreams that are not listed in the Islandora Content Model for the object (unless the user is an administrator).'),
     );
-    
+
     $form['advanced']['fedora_repository_use_imagecache_external_in_collection_view'] = array(
       '#type' => 'checkbox',
       '#title' => t('Allow imagecache_external use for thumbnails in collection view'),
@@ -355,14 +353,14 @@ class formClass {
       '#description' => t('If enabled, the default collection list view (or ' .
         'anywhere the function "@function" is used) will try to use ' .
         'imagecache_external, defaulting to the "@preset" preset.  XSLTs may ' .
-        'be updated to use this function.', 
+        'be updated to use this function.',
         array(
           '@function' => '_fedora_repository_render_image()',
           '@preset' => 'fedora_repository_collection_thumbnail',
           '@xsl' => 'sparql_to_html.xsl',
         )),
     );
-    
+
     $form['advanced']['fedora_control_group_control_during_ingest'] = array(
       '#type' => 'checkbox',
       '#title' => t('Allow control groups select in datastream ingest'),
@@ -370,6 +368,22 @@ class formClass {
       '#default_value' => variable_get('fedora_control_group_control_during_ingest', FALSE),
     );
 
+    //FITS functionality
+    $form['advanced']['enable_fits'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Enable FITS support?'),
+      '#description' => t('Whether or not we should create a FITS datastream upon object ingest.'),
+      '#default_value' => variable_get('enable_fits', TRUE),
+    );
+
+    //FITS Path
+    $form['advanced']['fits_path'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Path to FITS executable'),
+      '#description' => t("Path to FITS program on your server. It must be accessible by Drupal (i.e. apache user)."),
+      '#default_value' => variable_get('fits_path','/usr/local/bin/fits.sh'),
+    );
+
     //Export functionality
     $form['advanced']['module']['export_area'] = array(
       '#type' => 'textfield',
@@ -390,7 +404,7 @@ class formClass {
    * @param type $form_id
    * @param type $form_values
    * @param type $client
-   * @return type 
+   * @return type
    */
   function updateMetaData($form_id, $form_values, $client) {
     // ======================================
@@ -409,13 +423,13 @@ class formClass {
 
     // DC elements
     $previousElement = NULL; // Used in case we have to nest elements for qualified dublin core.
-    
+
     $label = null;
     foreach ($form_values as $key => $value) {
       //echo ($key);
       if ($key == 'dc:title-0') {
         $label = $value;
-      } 
+      }
       $index = strrpos($key, '-');
       $key = substr($key, 0, $index);
       $test = substr($key, 0, 2);
@@ -441,8 +455,8 @@ class formClass {
     {
       $object = new Fedora_Item($form_values['pid']);
       $object->modify_object($label);
-    } 
-    
+    }
+
     $dom->appendChild($oai);
 
     if (!$client) {
@@ -472,7 +486,7 @@ class formClass {
    * to determine if this user is allowed to ingest in this collection
    * we assume if they are able to modify objects in the collection they can ingest as well.
    * @param type $collection_pid
-   * @return type 
+   * @return type
    */
   function can_ingest_here($collection_pid) {
     module_load_include('inc', 'fedora_repository', 'SecurityClass');
@@ -483,7 +497,7 @@ class formClass {
   /**
    * Drupal's permissions at this point no xacml yet. xacml decisions are made by fedora
    * @param type $collection_pid
-   * @return type 
+   * @return type
    */
   function canShowIngestForm($collection_pid) {
     if (!user_access('ingest new fedora objects')) {
@@ -508,11 +522,11 @@ class formClass {
 
   /**
    * Creates the first page of the ingest form for editing QDC.
-   * 
+   *
    * @param string $collection_pid
    * @param string $collection_label
    * @param array $form_state
-   * 
+   *
    * @return array
    */
   function createQDCIngestFormPageOne($collection_pid, $collection_label, array &$form_state) {
@@ -558,11 +572,11 @@ class formClass {
 
   /**
    * Create the second page of the ingest form for editing QDC
-   * 
+   *
    * @param string $collection_pid
    * @param string $collection_label
    * @param array $form_state
-   * 
+   *
    * @return array
    */
   function createQDCIngestFormPageTwo($collection_pid, $collection_label, array &$form_state) {
@@ -593,11 +607,11 @@ class formClass {
 
   /**
    * Create the QDC Ingest Form.
-   * 
+   *
    * @param type $collection_pid
    * @param type $collection_label
-   * @param array $form_state 
-   * 
+   * @param array $form_state
+   *
    * @return array
    */
   function createQDCIngestForm($collection_pid, $collection_label, array &$form_state) {
@@ -613,18 +627,18 @@ class formClass {
 
   /**
    * Create a multi step form (wizard) for ingesting objects into Fedora
-   * 
+   *
    * @param string $collection_pid
    * @param string $collection_label
    * @param array $form_state
-   * 
-   * @return array 
+   *
+   * @return array
    */
   function createIngestForm($collection_pid, $collection_label, array &$form_state) {
     if (!$this->canShowIngestForm($collection_pid)) {
       return FALSE;
     }
-    
+
     drupal_set_title($collection_label);
     if (module_exists('islandora_content_model_forms')) {
       module_load_include('inc', 'islandora_content_model_forms', 'IngestObjectMetadataForm');
@@ -643,7 +657,7 @@ class formClass {
    * this function may not be being used
    * @param type $pid
    * @param type $form_state
-   * @return string 
+   * @return string
    */
   function createAddDataStreamForm($pid, &$form_state) {
     //dump_vars($form_state);
@@ -723,7 +737,7 @@ class formClass {
       // '#required'=>'TRUE',
       '#description' => t('The file to upload. (Only for Managed and Inline)')
     );
-    
+
     if (variable_get('fedora_control_group_control_during_ingest', FALSE)) {
       $form['fieldset']['ds_reference'] = array(
         '#type' => 'textfield',
@@ -732,7 +746,7 @@ class formClass {
         '#description' => t('A URL reference to resolve for the contents of the datastream.  (Required for External and Redirect, but will still work for Managed and Inline.)'),
       );
     }
-    
+
     $form['#redirect'] = "fedora/repository/$pid/";
     $form['fieldset']['submit'] = array(
       '#type' => 'submit',
@@ -758,7 +772,7 @@ class formClass {
         '#weight' => -1,
       );
     }
-    
+
     if (variable_get('fedora_control_group_control_during_ingest', FALSE)) {
       $form['fieldset']['control_group'] = array(
         '#type' => 'select',
@@ -778,13 +792,13 @@ class formClass {
 
   /**
    * Create QDC Edit form.
-   * 
+   *
    * @param string $pid
    * @param string $dsid
    * @param object $client
    * @param array $form_state
-   * 
-   * @return string 
+   *
+   * @return string
    */
   function createQDCEditForm($pid, $dsid, $client, &$form_state) {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -869,7 +883,7 @@ class formClass {
    * @param type $dsid
    * @param type $client
    * @param boolean $form_state
-   * @return type 
+   * @return type
    */
   function createMetaDataForm($pid, $dsid, $client, &$form_state) {
     if (module_exists('islandora_content_model_forms')) {
@@ -890,13 +904,13 @@ class formClass {
    * @param type $dsId
    * @param type $dsLabel
    * @param type $form_state
-   * @return type 
+   * @return type
    */
   function createReplaceDataStreamForm($pid, $dsId, $dsLabel, &$form_state) {
     $form = array();
 
     $form['#attributes']['enctype'] = 'multipart/form-data';
-    
+
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     $item = new Fedora_Item($pid);
     $info = $item->get_datastream_info($dsId);
@@ -922,7 +936,7 @@ class formClass {
         '#value' => t('If both a file and a reference are given, the file will be given preference.'),
       );
     }
-    
+
     $form['pid'] = array(
       '#type' => 'value',
       '#value' => $pid,
diff --git a/plugins/fits.inc b/plugins/fits.inc
index 4c20946b..16b2c86c 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -41,14 +41,16 @@ class fits {
    * @return type
    */
   function extractFits($parameterArray, $dsid, $file, $file_ext) {
-    $file_name = '_' . $dsid . '.xml';
-    $output = array();
-    exec('fits.sh -i ' . escapeshellarg($file) . '', $output);
-    if ( !file_put_contents($file . $file_name, implode("\n", $output)) ) {
-        exit("Error writing file: ". $file_name);
+    if (variable_get('enable_fits', TRUE) == 1) {
+      $file_name = '_' . $dsid . '.xml';
+      $output = array();
+      exec(variable_get('fits_path', '/usr/local/bin/fits.sh') .' -i ' . escapeshellarg($file) . '', $output);
+      if ( !file_put_contents($file . $file_name, implode("\n", $output)) ) {
+        exit("Error writing file: ". $file.$file_name);
+      }
+      $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_name;
+      return TRUE;
     }
-    $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_name;
-    return TRUE;
   }
 
   /**

From 850fd937fc3f00e55dac78af927cfb5d840fa568 Mon Sep 17 00:00:00 2001
From: Paul Pound <ppound@upei.ca>
Date: Tue, 14 Aug 2012 16:36:47 -0300
Subject: [PATCH 09/10] minor changes to fits integration

---
 formClass.inc    | 4 ++--
 plugins/fits.inc | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/formClass.inc b/formClass.inc
index 57de2819..908f3bc3 100644
--- a/formClass.inc
+++ b/formClass.inc
@@ -373,7 +373,7 @@ class formClass {
       '#type' => 'checkbox',
       '#title' => t('Enable FITS support?'),
       '#description' => t('Whether or not we should create a FITS datastream upon object ingest.'),
-      '#default_value' => variable_get('enable_fits', TRUE),
+      '#default_value' => variable_get('enable_fits', FALSE),
     );
 
     //FITS Path
@@ -389,7 +389,7 @@ class formClass {
       '#type' => 'textfield',
       '#title' => t('Export area'),
       '#default_value' => variable_get('export_area', file_directory_path() . '/fedora_export_area'),
-      '#description' => t("Path to the export area. It must be accessible by druapl (i.e. apache user)."),
+      '#description' => t("Path to the export area. It must be accessible by drupal (i.e. apache user)."),
       '#required' => TRUE,
     );
 
diff --git a/plugins/fits.inc b/plugins/fits.inc
index 16b2c86c..fb7a52da 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -41,16 +41,18 @@ class fits {
    * @return type
    */
   function extractFits($parameterArray, $dsid, $file, $file_ext) {
-    if (variable_get('enable_fits', TRUE) == 1) {
+    if (variable_get('enable_fits', FALSE) == 1) {
       $file_name = '_' . $dsid . '.xml';
       $output = array();
       exec(variable_get('fits_path', '/usr/local/bin/fits.sh') .' -i ' . escapeshellarg($file) . '', $output);
       if ( !file_put_contents($file . $file_name, implode("\n", $output)) ) {
-        exit("Error writing file: ". $file.$file_name);
+        //drupal_set_message(t("error writing fits file %s", array('%s' => "$file.$file_name")));
+        return FALSE;
       }
       $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_name;
       return TRUE;
     }
+    return TRUE; //this prevents getting the error following content model rules message when fits generation is turned off
   }
 
   /**

From 1efc9cedd8bb43a9e965689ab1af222efd8dfbdd Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Mon, 20 Aug 2012 11:35:15 -0400
Subject: [PATCH 10/10] normalize FITS dsid

---
 plugins/fits.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fits.inc b/plugins/fits.inc
index fb7a52da..15e8a12e 100644
--- a/plugins/fits.inc
+++ b/plugins/fits.inc
@@ -61,7 +61,7 @@ class fits {
    */
   function displayFits() {
     $output = '';
-    $fits = $this->item->get_datastream_dissemination('FITS');
+    $fits = $this->item->get_datastream_dissemination('TECHMD_FITS');
     if (trim($fits) != '') {
       $fitsDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
       if ($fitsDom != NULL) {