Merge branch '7.x' of github.com:Islandora/islandora into 7.x-jon-ingest

islandora-object-default-view.tpl.php

@@ -1,42 +0,0 @@
-<?php
-
-/*
- * islandora-object-default-view.tpl.php
- * 
- *
- * 
- * This file is part of Islandora.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with the program.  If not, see <http ://www.gnu.org/licenses/>.
- */
-
-
-?>
-<?php 
-/*object is a fedora tuque Object
- * $object->label
- * $object->id
- * to get the contents of a datastream
- * $object['dsid']->content 
- * etc.
- * 
- */
- 
-  
-  //dsm($object);
-  
-  print('this is the default view for '. $object->label .' ' .$object->id); 
-  
-?>
-

islandora-object.tpl.php

@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * islandora-object-default-view.tpl.php
+ * 
+ *
+ * 
+ * This file is part of Islandora.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with the program.  If not, see <http ://www.gnu.org/licenses/>.
+ */
+?>
+<?php
+
+/* 
+ * this is a template for objects that do not have a module to registered to build their display.
+ * 
+ * islandora_object is a fedora tuque Object
+ *    $object->label
+ *    $object->id
+ * to get the contents of a datastream
+ *    $object['dsid']->content 
+ * 
+ * $dublin_core is a Dublin_Core object
+ * which is an array of elements, such as dc.title
+ * and each element has an array of values.  dc.title can have none, one or many titles
+ * this is the case for all dc elements.
+ * 
+ * we can get a list of datastreams by doing
+ * foreach ($object as $ds){
+ * do something here
+ * }
+ * 
+ */
+
+//dsm($object);
+drupal_set_title($islandora_object->label);
+$dublin_core = $variables['islandora_dublin_core'];
+print($islandora_object->label . ' ' . $islandora_object->id);
+print ('<h3>datastreams</h3>');
+foreach ($islandora_object as $ds) {
+  print $ds->label . '<br>';
+  //do something
+}
+print('<h3>Dublin Core</h3>');
+
+foreach ($dublin_core as $element) {
+  if (!empty($element)) {
+   // print($element);
+   foreach ($element as  $key => $value) {      
+      foreach($value as $v){
+        if(!empty($v)){
+        print '<strong>'.($key).'</strong>: ';print($v).'<br />';
+        }
+      }
+    }
+  }
+}
+if(isset($variables['islandora_thumbnail_url'])){
+  print('<img src = "'.$variables['islandora_thumbnail_url'].'"/>');
+}
+?>
+

islandora.module

@@ -134,6 +134,7 @@ function islandora_menu() {
     'page callback' => 'islandora_datastream_as_attachment',
     'page arguments' => array(2, 4),
     'type' => MENU_CALLBACK,
+    'file' => 'utils/datastream.inc',
     'access arguments' => array(FEDORA_VIEW),
   );
   
@@ -142,6 +143,7 @@ function islandora_menu() {
     'page callback' => 'islandora_datastream_as_attachment',
     'page arguments' => array(2, 4),
     'type' => MENU_CALLBACK,
+    'file' => 'utils/datastream.inc',
     'access arguments' => array(FEDORA_VIEW),
   );
   
@@ -150,6 +152,7 @@ function islandora_menu() {
     'page callback' => 'islandora_datastream_as_attachment',
     'page arguments' => array(2, 4),
     'type' => MENU_CALLBACK,
+    'file' => 'utils/datastream.inc',
     'access arguments' => array(FEDORA_VIEW),
   );
   
@@ -267,9 +270,6 @@ function islandora_view_object($object_id) {
   $page_number = (empty($_GET['page'])) ? '1' : $_GET['page'];
   $page_size = (empty($_GET['pagesize'])) ? '10' : $_GET['pagesize'];
   module_load_include('inc', 'islandora', 'RestConnection');
-  //$user = new stdClass();
-  //$user->name = 'fedoraAdmin';
-  //$user->password = 'islandora';
   global $user;
   try {
     $restConnection = new RestConnection($user);
@@ -286,7 +286,12 @@ function islandora_view_object($object_id) {
     return "";
   }
   //module_invoke_all(islandora_display($arr)),
-  return $arr[0]; //just an example as we could have more then one array element
+  $output = "";
+  foreach($arr as $key => $value){
+    $output .= $key .'<br />'.$value; //if we have multiple modules handle one cmodel we need to iterate over multiple
+  }
+  //we could do another module invoke all here to build the edit tab with a default implemented in this module?
+  return $output; //just an example as we could have more then one array element
 }
 
 /**
@@ -299,8 +304,10 @@ function islandora_islandora_view_object($object){
   $supported_models = islandora_get_types();  
   $object_models = $object->models;
   $combined_list = array_intersect($supported_models, $object->models);
+  $output = "";
   if (empty($combined_list)) {
-    return theme('islandora_object_default_view', array('object' => $object));
+    $output = theme('islandora_default', array('islandora_object' => $object));
+    return array ('Default Output' => $output);
   }
 }
 
@@ -310,27 +317,13 @@ function islandora_islandora_view_object($object){
  */
 function islandora_theme() {
   return array(
-    'islandora_object_default_view' => array(
-      'template' => 'islandora-object-default-view',
-      'variables' => array('object' => NULL),
+    'islandora_default' => array(
+      'template' => 'islandora-object',
+      'variables' => array('islandora_object' => NULL),
     ),
    );
 }
 
-function islandora_datastream_as_attachment($object_id, $dsid){
-  module_load_include('inc', 'islandora', 'RestConnection');
-  global $user;
-  try {
-    $restConnection = new RestConnection($user);
-    $fedora_object = new FedoraObject($object_id, $restConnection->repository);
-  } catch (Exception $e) {
-    drupal_set_message(t('Error getting Islanndora datastream $d for object %s', array('%s' => $object_id, '%d' => $dsid)), 'error');
-    return"";
-  }
-  print($fedora_object[$dsid]->content);
-  exit();
-}
-
 /**
  * drupal hook_permissions function
  * @return array
@@ -383,3 +376,21 @@ function islandora_add_datastream($object_id) {
   }
   module_invoke_all('islandora_add_datastream', $object); //allow submodules to handle add datastream based on object type
 }
+
+function islandora_preprocess_islandora_default(&$variables){
+  $islandora_object = $variables['islandora_object'];
+  module_load_include('inc','islandora','utils/islandora_dublin_core');
+  try{
+    $dc = $islandora_object['DC']->content;
+    //$dc_xml = simplexml_load_string($dc);
+    $dc_object = Dublin_Core::import_from_xml_string($dc);
+  }catch(Exception $e){
+    drupal_set_message(t('Error retrieving object %s %t', array('%s' => $islandora_object->id,'%t'=>$e->getMessage())),'error');
+  }
+  $variables['islandora_dublin_core'] = $dc_object;
+  $variables['islandora_object_label'] = $islandora_object->label;
+  global $base_url;
+  if(isset($islandora_object['TN'])){
+      $variables['islandora_thumbnail_url'] = $base_url.'/islandora/object/'.$islandora_object->id.'/datastream/TN/view';
+  }
+}

islandora_basic_image/islandora-basic-image.tpl.php

@@ -20,13 +20,24 @@
  * You should have received a copy of the GNU General Public License
  * along with the program.  If not, see <http ://www.gnu.org/licenses/>.
  */
-
-
 ?>
-<?php 
+<?php
+
   $object = $variables['islandora_object'];
   $image_url = $variables['islandora_image_url'];
-  print($object->label); 
-  print('<img src = "'.$image_url.'"/>');
+  drupal_set_title($object->label);
+  foreach ($variables['islandora_dublin_core'] as $element) {
+    if (!empty($element)) {
+      foreach ($element as $key => $value) {
+        foreach ($value as $v) {
+          if (!empty($v)) {
+            print '<strong>' . ($key) . '</strong>: ';
+            print($v) . '<br />';
+          }
+        }
+      }
+    }
+  }
+  print('<img src = "' . $image_url . '"/>');
 ?>
 

islandora_basic_image/islandora_basic_image.module

@@ -120,7 +120,7 @@ function islandora_basic_image_islandora_view_object($object, $user, $page_numbe
   }
   $output = theme('islandora_basic_image', array('islandora_object' => $object));
   
-  return $output;
+  return array('Basic Image Output' =>$output);
 }
 
 function islandora_preprocess_islandora_basic_image(&$variables){

utils/datastream.inc

@@ -0,0 +1,34 @@
+<?php
+/**
+ * @file datastream.inc 
+ */
+
+/**
+ *
+ * @global object $user
+ * @param string $object_id
+ * @param string $dsid
+ * @return stream 
+ *  printsdatastream to browser
+ */
+function islandora_datastream_as_attachment($object_id, $dsid){
+  module_load_include('inc', 'islandora', 'RestConnection');
+  global $user;
+  try {
+    $restConnection = new RestConnection($user);
+    $fedora_object = new FedoraObject($object_id, $restConnection->repository);
+  } catch (Exception $e) {
+    drupal_set_message(t('Error getting Islanndora datastream $d for object %s', array('%s' => $object_id, '%d' => $dsid)), 'error');
+    return"";
+  }
+  header('Content-type: '.$fedora_object[$dsid]->mimetype);
+  header('Content-length: '.$fedora_object[$dsid]->size);
+  header("Cache-control: private");
+  $method = arg(5);
+  if($method =='download'){
+    header("Content-Disposition: attachment; filename=\"".$fedora_object[$dsid]->label);
+  }
+  print ($fedora_object[$dsid]->content);
+  exit();
+}
+?>