6.x

CollectionClass.inc

@@ -28,11 +28,9 @@ class CollectionClass {
    * @return CollectionClass
    */
   function __construct($pid = NULL) {
-    if (!empty($pid)) {
-      module_load_include('inc', 'fedora_repository', 'ObjectHelper');
-      $this->collectionObject = new ObjectHelper($pid);
-      $this->pid = $pid;
-    }
+    module_load_include('inc', 'fedora_repository', 'ObjectHelper');
+    $this->collectionObject = new ObjectHelper();
+    $this->pid = $pid;
   }
 
   public static function getCollectionQuery($pid) {
@@ -672,6 +670,86 @@ class CollectionClass {
     return $page;
   }
 
+  /**
+   * Assemble results in a somewhat more logical manner...
+   * 
+   * ...  Compared to generating a table in XSLT to contain a list (as
+   * renderCollection() used to do/does by default).
+   * 
+   * @param $sparql_results array
+   *   The array of results as yielded by ObjectHelper::parseSparqlResults()
+   *   (and those associated functions which make use of it).
+   *   Each result must contain:
+   *    - 'object': The PID/URI of the child object.
+   *    - 'title': A title for the child object.
+   *   and may contain:
+   *    - 'thumbnail': URI to a datastream. (will default to the 'TN' stream on the child)
+   * @return
+   *   An array to be passed to drupal_render, containing a pager, an unordered
+   *   list of items, and another pager.
+   */
+  public static function assembleCollectionView($sparql_results) {
+    $per_page = 20; //XXX:  Make this configurable.
+    $pager_name = 0;
+    $total = count($sparql_results);
+    $pager_page = self::hackPager($pager_name, $per_page, $total);
+    $max_title_length = 60;
+
+    $results = array();
+    foreach (array_slice($sparql_results, $per_page * $pager_page, $per_page) as $result) {
+      $title = $result['title'];
+      $truncated_title = truncate_utf8($title, $max_title_length, TRUE, TRUE, 5);
+      $obj_path = "fedora/repository/{$result['object']}";
+
+      //Get a thumbnail
+      $tn_path = ($result['thumbnail'] ?
+        "fedora/repository/{$result['thumbnail']}":
+        "$obj_path/TN");
+
+      $thumbnail = _fedora_repository_render_image($tn_path);
+
+      $results[] = array(
+          'data' => l($thumbnail, $obj_path, array(
+              'html' => TRUE,
+              'attributes' => array(
+                  'class' => 'results-image',
+              ),
+          )) . l($truncated_title, $obj_path, array('attributes' => array('class' => 'results-text'))),
+      );
+    }
+    if (!$results) {
+      drupal_set_message(t("No objects in this collection (or bad query)."));
+    }
+    else {
+      $first = $per_page * $pager_page;
+      $last = (($total - $first) > $per_page)?
+      ($first + $per_page):
+      $total;
+      $results_range_text = t('Results @first to @last of @total', array(
+          '@first' => $first + 1,
+          '@last' => $last,
+          '@total' => $total,
+      ));
+
+      return array(
+        array(
+          '#type' => 'markup',
+          '#value' => theme('pager', array(), $per_page, $pager_name),
+        ),
+        array(
+          '#type' => 'markup',
+          '#value' => theme('item_list', $results, $result_range_text, 'ul', array(
+            'class' => 'islandora-collection-results-list',
+          ))
+        ),
+        array(
+          '#type' => 'markup',
+          '#value' => theme('pager', array(), $per_page, $pager_name)
+        ),
+      );
+    }
+  }
+
   /**
    * render collection
    * @global type $base_url
@@ -685,17 +763,8 @@ class CollectionClass {
   function renderCollection($content, $pid, $dsId, $collectionName, $pageNumber = NULL) {
     $path = drupal_get_path('module', 'fedora_repository');
     global $base_url;
-    $collection_pid = $pid; //we will be changing the pid later maybe
-    $parsedContent = NULL;
-    if(!isset($this->collectionObject)){
-      $this->collectionObject = new ObjectHelper($pid);
-    } 
+
     $contentModels = $this->collectionObject->get_content_models_list($pid);
-    $isCollection = FALSE;
-    //if this is a collection object store the $pid in the session as it will come in handy
-    //after a purge or ingest to return to the correct collection.
-
-    $fedoraItem = NULL;
 
     if (empty($collectionName)) {
       $collectionName = menu_get_active_title();
@@ -706,48 +775,13 @@ class CollectionClass {
     $objectList = '';
     if (isset($content) && $content != FALSE) {
       if (!$xslContent) { //Didn't find an XSLT.
-        $intermediate_results = ObjectHelper::parse_sparql_results($content);
-        unset($content);
-
-        $per_page = 20; //XXX:  Make this configurable.
-        $pager_name = 0;
-        $total = count($intermediate_results);
-        $pager_page = self::hackPager($pager_name, $per_page, $total);
-
-        $results = array();
-        foreach (array_slice($intermediate_results, $per_page * $pager_page, $per_page) as $result) {
-          $title = $result['title'];
-          $obj_path = "fedora/repository/{$result['object']}";
-          $thumbnail = theme('image', "$obj_path/TN", $title, $title, array(), FALSE);
-          $results[] = array(
-            'data' => l($thumbnail, $obj_path, array(
-              'html' => TRUE,
-              'attributes' => array(
-                'class' => 'results-image',
-              ),
-            )) . l($title, $obj_path, array('attributes' => array('class' => 'results-text'))),
-          );
-        }
-        if (!$results) {
-          drupal_set_message(t("No objects in this collection (or bad query)."));
-        }
-        else {
-          $first = $per_page * $pager_page;
-          $last = (($total - $first) > $per_page)?
-            ($first + $per_page):
-            $total;
-          $results_range_text = t('Results @first to @last of @total', array(
-            '@first' => $first + 1,
-            '@last' => $last,
-            '@total' => $total,
-          ));
-          //$objectList = '<h3>' . $results_range_text . '</h3>'; 
-          $objectList .= theme('pager', array(), $per_page, $pager_name);
-          $objectList .= theme('item_list', $results, $result_range_text, 'ul', array(
-            'class' => 'islandora-collection-results-list',
-          ));
-          $objectList .= theme('pager', array(), $per_page, $pager_name);
-        }
+        return drupal_render(
+          self::assembleCollectionView(
+            $this->collectionObject->parseSparqlResults(
+              $content
+            )
+          )
+        );
       }
       else {
         if (!$pageNumber) {
@@ -762,7 +796,7 @@ class CollectionClass {
           try {
             $proc = new XsltProcessor();
             $options = array( //Could make this the return of a hook?  
-              'collectionPid' => $collection_pid,
+              'collectionPid' => $pid,
               'collectionTitle' => $collectionName,
               'baseUrl' => $base_url,
               'path' => "$base_url/$path",
@@ -774,10 +808,7 @@ class CollectionClass {
             $proc->registerPHPFunctions();
             $xsl = new DomDocument();
             $xsl->loadXML($xslContent);
-            // php xsl does not seem to work with namespaces so removing it below
-            // I may have just been being stupid here
-            // $content = str_ireplace('xmlns="http://www.w3.org/2001/sw/DataAccess/rf1/result"', '', $content);
-
+
             $xsl = $proc->importStylesheet($xsl);
             $newdom = $proc->transformToDoc($input);
 

MimeClass.inc

@@ -231,9 +231,7 @@ class MimeClass {
    * @return type 
    */
   public function get_mimetype($filename, $debug = FALSE) {
-
-    $file_name_and_extension = explode('.', $filename);
-    $ext = strtolower(array_pop($file_name_and_extension));
+    $ext = strtolower(substr($filename, strrpos($filename, '.') + 1));
 
     if (!empty($this->private_mime_types[$ext])) {
       if (TRUE === $debug)

ObjectDetails.inc

@@ -0,0 +1,184 @@
+<?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_file = './'. $path .'/'. variable_get('islandora_object_details_xslt_sheet', 'xsl/convertQDC.xsl');
+  if (is_readable($xsl_file)) {
+    $xsl = new DOMDocument();
+    $xsl->load($xsl_file);
+    $input = new DOMDocument();
+    $input->loadXML(trim($xmlstr));
+    $xsl = $proc->importStylesheet($xsl);
+    $newdom = $proc->transformToDoc($input);
+    $output = $newdom->saveHTML();
+    return $output;
+  }
+  else {
+    watchdog('fedora_repository', 'The XSLT file @xslt_name is not readable.', array(
+      '@xslt_name' => $xsl_file,
+    ));
+  }
+}
+
+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']);
+}