added responsibility filed to versions

includes/datastream.version.inc

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * The form displayed that shows the datastream version history.
@@ -10,19 +11,36 @@
 function islandora_datastream_version_table($datastream) {
   module_load_include('inc', 'islandora', 'includes/datastream');
   module_load_include('inc', 'islandora', 'includes/utilities');
-
+  $parent = $datastream->parent;
   drupal_set_title(t("@dsid Previous Versions", array('@dsid' => $datastream->id)));
+  $audit_values = islandora_get_audit_trail($parent->id, $datastream->id);
 
   $header = array();
   $header[] = array('data' => t('Created Date'));
   $header[] = array('data' => t('Size'));
   $header[] = array('data' => t('Label'));
+  $header[] = array('data' => t('Responsibility'));
   $header[] = array('data' => t('Mime type'));
   $header[] = array('data' => t('Operations'), 'colspan' => '2');
   $rows = array();
 
   foreach ($datastream as $version => $datastream_version) {
     $row = array();
+    $reponsibility = $parent->owner;
+    foreach ($audit_values as $audit_value) {
+      $internal = $datastream_version->createdDate;
+      if ($audit_value['date'] == $datastream_version->createdDate) {
+        $reponsibility = $audit_value['responsibility'];
+      }
+    }
+    $user = user_load_by_name($reponsibility);
+    if ($user) {
+      $user_id = $user->uid;
+      $user_val = l($reponsibility, "user/$user_id");
+    }
+    else {
+      $user_val = $reponsibility;
+    }
     $row[] = array(
       'class' => 'datastream-date',
       'data' => theme('islandora_datastream_view_link', array(
@@ -39,6 +57,10 @@ function islandora_datastream_version_table($datastream) {
       'class' => 'datastream-label',
       'data' => $datastream_version->label,
     );
+    $row[] = array(
+      'class' => 'datastream-responsibility',
+      'data' => $user_val,
+    );
     $row[] = array(
       'class' => 'datastream-mime',
       'data' => $datastream_version->mimeType,
@@ -85,12 +107,7 @@ function islandora_delete_datastream_version_form(array $form, array &$form_stat
 
   $form_state['datastream'] = $datastream;
   $form_state['version'] = $version;
-  return confirm_form($form,
+  return confirm_form($form, t('Are you sure you want to delete version @version of the @dsid datastream?', array('@dsid' => $datastream->id, '@version' => $version)), "islandora/object/{$datastream->parent->id}", t('This action cannot be undone.'), t('Delete'), t('Cancel')
-    t('Are you sure you want to delete version @version of the @dsid datastream?', array('@dsid' => $datastream->id, '@version' => $version)),
-    "islandora/object/{$datastream->parent->id}",
-    t('This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel')
   );
 }
 
@@ -120,15 +137,15 @@ function islandora_delete_datastream_version_form_submit(array $form, array &$fo
   }
   catch (Exception $e) {
     drupal_set_message(t('Error deleting version %v of %s datastream from object %o %e', array(
-          '%v' => $version,
+      '%v' => $version,
-          '%s' => $datastream_id,
+      '%s' => $datastream_id,
-          '%o' => $object->label,
+      '%o' => $object->label,
-          '%e' => $e->getMessage())), 'error');
+      '%e' => $e->getMessage())), 'error');
   }
 
   drupal_set_message(t('%d datastream version successfully deleted from Islandora object %o', array(
-        '%d' => $datastream_id,
+    '%d' => $datastream_id,
-        '%o' => $object->label)));
+    '%o' => $object->label)));
 
   $form_state['redirect'] = "islandora/object/{$object->id}/datastream/{$datastream->id}/version";
 }
@@ -157,12 +174,7 @@ function islandora_revert_datastream_version_form(array $form, array &$form_stat
   $form_state['object_id'] = $datastream->parent->id;
   $form_state['version'] = $version;
 
-  return confirm_form($form,
+  return confirm_form($form, t('Are you sure you want to revert to version @version of the @dsid datastream?', array('@dsid' => $datastream->id, '@version' => $version)), "islandora/object/{$datastream->parent->id}", "", t('Revert'), t('Cancel')
-    t('Are you sure you want to revert to version @version of the @dsid datastream?', array('@dsid' => $datastream->id, '@version' => $version)),
-    "islandora/object/{$datastream->parent->id}",
-    "",
-    t('Revert'),
-    t('Cancel')
   );
 }
 
@@ -202,9 +214,45 @@ function islandora_revert_datastream_version_form_submit(array $form, array &$fo
   }
 
   drupal_set_message(t('%d datastream successfully reverted to version %v for Islandora object %o', array(
-        '%d' => $datastream_to_revert->id,
+    '%d' => $datastream_to_revert->id,
-        '%v' => $version,
+    '%v' => $version,
-        '%o' => $islandora_object->label)));
+    '%o' => $islandora_object->label)));
 
   $form_state['redirect'] = "islandora/object/{$islandora_object->id}/datastream/{$datastream_to_revert->id}/version";
 }
+
+/**
+ * Gets Audit datastream values from foxml.
+ *
+ * @param String $pid
+ *   PID of parent object
+ *
+ * @return array
+ *   Array of audit values
+ */
+function islandora_get_audit_trail($pid, $dsid) {
+  $url = variable_get('islandora_base_url', 'http://localhost:8080/fedora');
+  $connection = islandora_get_tuque_connection(NULL, $url);
+  $xml = $connection->api->m->getObjectXml($pid);
+  $simple_xml = simplexml_load_string($xml);
+  $fox_ns = "info:fedora/fedora-system:def/foxml#";
+  $audit_ns = 'info:fedora/fedora-system:def/audit#';
+  $foxml_nodes = $simple_xml->children($fox_ns);
+  foreach ($foxml_nodes as $node) {
+    if ($node->attributes()->ID == "AUDIT") {
+      $content = $node->datastreamVersion->xmlContent;
+      $audit_nodes = $content->children($audit_ns);
+    }
+  }
+  $audit_values = array();
+  if (isset($audit_nodes)) {
+    foreach ($audit_nodes->auditTrail->record as $record) {
+      if ($dsid == $record->componentID) {
+        $values['responsibility'] = $record->responsibility;
+        $values['date'] = $record->date;
+        $audit_values[] = $values;
+      }
+    }
+  }
+  return $audit_values;
+}