Merge branch '6.x' of git://github.com/jmacwilliams/islandora into HEAD

ObjectDetails.inc

@@ -0,0 +1,179 @@
+<?php
+
+function fedora_repository_islandora_object_details_display() {
+  $profiles = array(
+    'hidden' => array(
+      "name" => "Hidden",
+      "module" => "fedora_repository",
+      "file" => "ObjectDetails.inc",
+      "function" => "fedora_repository_object_details_hidden",
+      "description" => t("No object details page"),
+    ),
+    'xslt' => array(
+      "name" => "XSLT",
+      "module" => "fedora_repository",
+      "file" => "ObjectDetails.inc",
+      "function" => "fedora_repository_object_details_xslt",
+      "description" => t("Show a datastream with an XSLT"),
+      "config" => "admin/settings/fedora_repository/object_details_xslt",
+    ),
+    'table' => array(
+      "name" => "Table",
+      "module" => "fedora_repository",
+      "file" => "ObjectDetails.inc",
+      "function" => "fedora_repository_object_details_table",
+      "description" => t("Show a datastream with a table"),
+      "config" => "admin/settings/fedora_repository/object_details_table",
+    )
+  );
+  return $profiles;
+}
+
+function fedora_repository_object_details_hidden($item) {
+  // do nothing
+  return "";
+}
+
+function fedora_repository_object_details_XSLT($item) {
+  global $base_url;
+  $path = drupal_get_path('module', 'fedora_repository');
+  module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
+
+  $dsid = variable_get('islandora_object_details_xslt_datastream', 'DC');
+  // special case for DC+QDC for backward compatibility
+  if ($dsid == 'DC' || $dsid == 'QDC') {
+    $dsid = array_key_exists('QDC', $item->get_datastreams_list_as_array()) ? 'QDC' : 'DC';
+  }
+  $xmlstr = $item->get_datastream_dissemination($dsid);
+
+  if (empty($xmlstr)) {
+    return '';
+  }
+
+  try {
+    $proc = new XsltProcessor();
+  } catch (Exception $e) {
+    drupal_set_message($e->getMessage(), 'error');
+    watchdog('fedora_repository', "Error while creating XSLT processor: @e", array('@e' => $e->getMessage()), WATCHDOG_ERROR);
+    return;
+  }
+
+  $proc->setParameter('', 'baseUrl', $base_url);
+  $proc->setParameter('', 'path', $base_url . '/' . $path);
+  $input = NULL;
+  $xsl = new DomDocument();
+  try {
+    $xsl->load('./'. $path .'/'. variable_get('islandora_object_details_xslt_sheet', 'xsl/convertQDC.xsl'));
+    $input = new DomDocument();
+    $input->loadXML(trim($xmlstr));
+  } catch (Exception $e) {
+    watchdog('fedora_repository', "Problem loading XSL file: @e", array('@e' => $e->getMessage()), NULL, WATCHDOG_ERROR);
+  }
+  $xsl = $proc->importStylesheet($xsl);
+  $newdom = $proc->transformToDoc($input);
+  $output = $newdom->saveHTML();
+  return $output;
+}
+
+function fedora_repository_object_details_table($item) {
+  global $base_url;
+  $path = drupal_get_path('module', 'fedora_repository');
+  module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
+
+  $dsid = variable_get('islandora_object_details_table_datastream', 'DC');
+  // special case for DC+QDC for backward compatibility
+  if ($dsid == 'DC' || $dsid == 'QDC') {
+    $dsid = array_key_exists('QDC', $item->get_datastreams_list_as_array()) ? 'QDC' : 'DC';
+  }
+  $xmlstr = $item->get_datastream_dissemination($dsid);
+
+  if (empty($xmlstr)) {
+    return '';
+  }
+
+  $simplexml = new SimpleXMLElement($xmlstr);
+
+  $headers = array(
+    array(
+      'data' => t('Metadata'),
+      'colspan' => 2,
+    ),
+  );
+  $rows = array();
+  foreach ($simplexml->getNamespaces(TRUE) as $ns) {
+    foreach ($simplexml->children($ns) as $child) {
+      $rows[] = array(
+        array(
+          'data' => $child->getName(),
+          'class' => 'dc-tag-name',
+        ),
+        array(
+          'data' => (string)$child,
+          'class' => 'dc-content',
+        ),
+      );
+    }
+  }
+
+  return theme('table', $headers, $rows, array('class' => 'dc-table'));
+}
+
+// configuration pages
+function fedora_repository_object_details_XSLT_config() {
+  $form = array();
+  $form['config'] = array(
+    '#type' => 'fieldset',
+    '#title' => t("XSLT display options"),
+  );
+
+  $form['config']['xslt'] = array(
+    '#type' => 'textfield',
+    '#title' => t("XSL transform to use"),
+    '#default_value' => variable_get('islandora_object_details_xslt_sheet', 'xsl/convertQDC.xsl'),
+    '#required' => TRUE,
+  );
+  $form['config']['dsid'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Datastream to transform"),
+    '#default_value' => variable_get('islandora_object_details_xslt_datastream', 'DC'),
+    '#required' => TRUE,
+  );
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t("Submit"),
+    '#weight' => 1,
+  );
+
+  return $form;
+}
+
+function fedora_repository_object_details_table_config() {
+  $form = array();
+  $form['config'] = array(
+    '#type' => 'fieldset',
+    '#title' => t("Table display options"),
+  );
+
+  $form['config']['dsid'] = array(
+    '#type' => 'textfield',
+    '#title' => t("Datastream to transform"),
+    '#default_value' => variable_get('islandora_object_details_table_datastream', 'DC'),
+    '#required' => TRUE,
+  );
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t("Submit"),
+    '#weight' => 1,
+  );
+
+  return $form;
+}
+
+function fedora_repository_object_details_XSLT_config_submit($form, &$form_state) {
+  variable_set('islandora_object_details_xslt_sheet', $form_state['values']['xslt']);
+  variable_set('islandora_object_details_xslt_datastream', $form_state['values']['dsid']);
+}
+
+function fedora_repository_object_details_table_config_submit($form, &$form_state) {
+  variable_set('islandora_object_details_table_datastream', $form_state['values']['dsid']);
+}

formClass.inc

@@ -179,6 +179,23 @@ class formClass {
       'access arguments' => array('view fedora collection'),
     );
 
+    $items['admin/settings/fedora_repository/object_details_xslt'] = array(
+      'title' => "",
+      'type' => MENU_CALLBACK,
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('fedora_repository_object_details_XSLT_config'),
+      'file' => 'ObjectDetails.inc',
+      'access arguments' => array('administer site configuration'),
+    );
+    $items['admin/settings/fedora_repository/object_details_table'] = array(
+      'title' => "",
+      'type' => MENU_CALLBACK,
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('fedora_repository_object_details_table_config'),
+      'file' => 'ObjectDetails.inc',
+      'access arguments' => array('administer site configuration'),
+    );
+
     return $items;
   }
 
@@ -233,7 +250,7 @@ class formClass {
           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>',
     );
-    
+
     $form['fedora_soap_manage_url'] = array(
       '#type' => 'textfield',
       '#title' => t('Fedora SOAP management URL'),
@@ -241,7 +258,7 @@ class formClass {
       '#required' => TRUE,
       '#weight' => -10
     );
-        
+
 // will allow admin user to remove namepsace restrictions if not explicitly disallowed  in settings.php
     if (variable_get('allow_open_namespace', TRUE)) {
       $form['fedora_namespace'] = array(
@@ -282,10 +299,11 @@ class formClass {
     $form['tabs'] = array(
       '#type' => 'fieldset',
       '#title' => t('Tabs Configuration'),
-      '#description' => t('Configure the tabs avaialble when viewing Fedora objects.'),
+      '#description' => t('Configure the tabs available when viewing Fedora objects.'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
+
     //when checked show object details tab
     $form['tabs']['fedora_repository_show_object_details_tab'] = array(
       '#type' => 'checkbox',
@@ -293,7 +311,27 @@ class formClass {
       '#default_value' => variable_get('fedora_repository_show_object_details_tab', TRUE),
       '#description' => t("When enabled, the 'Object Details' tab will be visible to users with the correct permissions when viewing an object in the repository"),
     );
-    
+
+    module_load_include('inc', 'fedora_repository', 'ObjectDetails');
+    $primary_display_mode = variable_get('islandora_object_details_display_table', 'xslt');
+    $profiles = module_invoke_all("islandora_object_details_display");
+
+    $display_options = array();
+    foreach ($profiles as $machine_name => $profile) {
+      $display_options[$machine_name] = $profile['name'];
+      $config_path = $profile['config'];
+      if (isset($config_path) && $config_path != ""){
+        $display_options[$machine_name] .= " (". l("config", $config_path, array()) .")";
+      }
+    }
+    $form['tabs']['islandora_object_details_display_table'] = array(
+      '#type' => 'radios',
+      '#title' => t('Show object details as'),
+      '#options' => $display_options,
+      '#default_value' => $primary_display_mode,
+      '#description' => t("Tells Islandora how to display the object details page for each object"),
+    );
+
     $form['advanced'] = array(
       '#type' => 'fieldset',
       '#title' => t('Advanced configuration options'),

plugins/FedoraObjectDetailedContent.inc

@@ -48,8 +48,27 @@ class FedoraObjectDetailedContent {
     $tabset['fedora_object_details']['tabset'] = array(
       '#type' => 'tabset',
     );
-    
+
-    $dc_html = $objectHelper->getFormattedDC($this->item);
+    module_load_include('inc', 'fedora_repository', 'ObjectDetails');
+    $object_details_profile = variable_get('islandora_object_details_display_table', 'xslt');
+    $profiles = module_invoke_all("islandora_object_details_display");
+    $profile = $profiles[$object_details_profile];
+    if (!isset($profile)) {
+      // default behaviour
+      watchdog('fedora_repository', "Error while reading the default object details display profile: @e", array("@e" => $e->getMessage()), WATCHDOG_WARNING);
+      $dc_html = $objectHelper->getFormattedDC($this->item);
+    }
+    else {
+      // invoke the requested display profile
+      require_once(drupal_get_path('module', $profile['module']) ."/". $profile['file']);
+      $details_function = $profile['function'];
+      if (function_exists($details_function)) {
+        $dc_html = $details_function($this->item);
+      }
+      else {
+        // problem
+      }
+    }
 
     $i = 0;
     if (fedora_repository_access(OBJECTHELPER :: $VIEW_DETAILED_CONTENT_LIST, $this->pid, $user)) {

xsl/mods2html.xsl

@@ -0,0 +1,207 @@
+<xsl:stylesheet xmlns:mods="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="mods" version="1.0">
+<xsl:output indent="yes" method="html"/>
+<xsl:variable name="dictionary" select="document('http://www.loc.gov/standards/mods/modsDictionary.xml')/dictionary"/>
+
+<xsl:template match="/">
+<!--html>
+<head>
+<style type="text/css">TD {vertical-align:top}</style>
+</head>
+<body-->
+  <xsl:choose>
+    <xsl:when test="mods:modsCollection">
+      <xsl:apply-templates select="mods:modsCollection"/>
+    </xsl:when>
+    <xsl:when test="mods:mods">
+      <xsl:apply-templates select="mods:mods"/>
+    </xsl:when>
+  </xsl:choose>
+<!--/body>
+</html-->
+</xsl:template>
+
+<xsl:template match="mods:modsCollection">
+  <xsl:apply-templates select="mods:mods"/>
+</xsl:template>
+
+<xsl:template match="mods:mods">
+  <table class="modsContainer">
+  <xsl:apply-templates/>
+  </table>
+  <!--hr/-->
+</xsl:template>
+
+<xsl:template match="*">
+  <xsl:choose>
+    <xsl:when test="child::*">
+      <tr><td colspan="2">
+      <span class="modsLabelTop">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td></tr>
+      <xsl:apply-templates mode="level2"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <tr><td>
+      <span class="modsLabelTop">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td><td>
+      <span class="modsValueTop">
+      <xsl:call-template name="formatValue"/>
+      </span>
+      </td></tr>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="formatValue">
+  <xsl:choose>
+    <xsl:when test="@type='uri'">
+      <a href="{text()}" class="modsLink">
+      <xsl:value-of select="text()"/>
+      </a>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="text()"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="*" mode="level2">
+  <xsl:choose>
+    <xsl:when test="child::*">
+      <tr><td colspan="2">
+      <span class="modsLabelLevel2">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td></tr>
+      <xsl:apply-templates mode="level3"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <tr><td>
+      <span class="modsLabelLevel2">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td><td>
+      <span class="modsValueLevel2">
+      <xsl:call-template name="formatValue"/>
+      </span>
+      </td></tr>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="*" mode="level3">
+  <xsl:choose>
+    <xsl:when test="child::*">
+      <tr><td colspan="2">
+      <span class="modsLabelLevel3">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td></tr>
+      <xsl:apply-templates mode="level4"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <tr><td>
+      <span class="modsLabelLevel3">
+      <xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="local-name()"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="attr"/>
+      </span>
+      </td><td>
+      <span class="modsValueLevel3">
+      <xsl:call-template name="formatValue"/>
+      </span>
+      </td></tr>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="*" mode="level4">
+  <tr><td>
+  <span class="modsLabelLevel4">
+  <xsl:call-template name="longName">
+    <xsl:with-param name="name">
+      <xsl:value-of select="local-name()"/>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="attr"/>
+  </span>
+  </td><td>
+  <span class="modsValueLevel4">
+  <xsl:value-of select="text()"/>
+  </span>
+  </td></tr>
+</xsl:template>
+
+<xsl:template name="longName">
+  <xsl:param name="name"/>
+  <xsl:choose>
+    <xsl:when test="$dictionary/entry[@key=$name]">
+      <xsl:value-of select="$dictionary/entry[@key=$name]"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$name"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="attr">
+  <xsl:for-each select="@type|@point">:
+    <xsl:call-template name="longName">
+      <xsl:with-param name="name">
+        <xsl:value-of select="."/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:if test="@authority or @edition">
+    <xsl:for-each select="@authority">(<xsl:call-template name="longName">
+        <xsl:with-param name="name">
+          <xsl:value-of select="."/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:for-each>
+    <xsl:if test="@edition">
+      Edition <xsl:value-of select="@edition"/>
+    </xsl:if>)
+  </xsl:if>
+  <xsl:variable name="attrStr">
+    <xsl:for-each select="@*[local-name()!='edition' and local-name()!='type' and local-name()!='authority' and local-name()!='point']">
+      <xsl:value-of select="local-name()"/>="<xsl:value-of select="."/>",
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:variable name="nattrStr" select="normalize-space($attrStr)"/>
+    <xsl:if test="string-length($nattrStr)">
+      (<xsl:value-of select="substring($nattrStr,1,string-length($nattrStr)-1)"/>)
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>