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

includes/Breadcrumbs.inc

@@ -0,0 +1,78 @@
+<?php
+
+function islandora_get_breadcrumbs($pid) {
+  module_load_include('inc', 'islandora', 'RestConnection');
+  $breadcrumbs = array();
+
+  $connection = new RestConnection();
+  islandora_get_breadcrumbs_recursive($pid, $breadcrumbs, $connection->repository);
+  
+  if(isset($breadcrumbs[0])) {
+    unset($breadcrumbs[0]);
+  }
+
+  $breadcrumbs = array_reverse($breadcrumbs);
+
+  return $breadcrumbs;
+}
+
+/**
+ * Builds an array of drupal links for use in breadcrumbs.
+ *
+ * @todo Make fully recursive...
+ *
+ * @global type $base_url
+ * @param type $pid
+ * @param type $breadcrumbs
+ * @param type $level
+ */
+function islandora_get_breadcrumbs_recursive($pid, &$breadcrumbs, $repository) {
+  // Before executing the query, we hve a base case of accessing the top-level collection
+  global $base_url;
+  static $max_level = 10;
+  static $level = -1;
+
+  if (count($breadcrumbs) === 0) {
+    $level = $max_level;
+  }
+
+  $root = variable_get('islandora_repository_pid', 'islandora:root');
+  if ($pid == $root) {
+    $breadcrumbs[] = l(menu_get_active_title(), 'islandora');
+    $breadcrumbs[] = l(t('Home'), '<front>');
+  }
+  else {
+    $query_string = 'select $parentObject $title $content from <#ri>
+                      where (
+                        <info:fedora/' . $pid . '> <fedora-model:label> $title
+                        and $parentObject <fedora-model:hasModel> $content
+                        and (
+                          <info:fedora/' . $pid . '> <fedora-rels-ext:isMemberOfCollection> $parentObject
+                          or <info:fedora/' . $pid . '> <fedora-rels-ext:isMemberOf> $parentObject
+                          or <info:fedora/' . $pid . '> <fedora-rels-ext:isPartOf> $parentObject
+                        )
+                        and $parentObject <fedora-model:state> <info:fedora/fedora-system:def/model#Active>
+                      )
+                      minus $content <mulgara:is> <info:fedora/fedora-system:FedoraObject-3.0>
+                      order by $title desc';
+    $results = $repository->ri->itqlQuery($query_string);
+
+    if (count($results) > 0  && $level > 0) {
+      $parent = $results[0]['parentObject']['value'];
+      $this_title = $results[0]['title']['value'];
+
+      if (empty($this_title)) {
+        $this_title = t('-');
+      }
+
+      $breadcrumbs[] = l($this_title, "islandora/object/$pid");
+
+      $level--;
+      islandora_get_breadcrumbs_recursive($parent, $breadcrumbs, $repository);
+    }
+    else {
+      $breadcrumbs[] = '...'; //Add an non-link, as we don't know how to get back to the root.
+      islandora_get_breadcrumbs_recursive($root, $breadcrumbs, $repository); //And render the last two links and break (on the next pass).
+    }
+  }
+}

includes/datastream.inc

@@ -19,21 +19,26 @@ function islandora_datastream_as_attachment($object_id, $dsid) {
   try {
     $restConnection = new RestConnection($user);
     $fedora_object = new FedoraObject($object_id, $restConnection->repository);
+
+    // if the object exists but the datastream doesn't
+    if(!isset($fedora_object[$dsid])) {
+      return drupal_not_found();
+    }
+
+    header('Content-type: ' . $fedora_object[$dsid]->mimetype);
+    if($fedora_object[$dsid]->controlGroup == 'M' || $fedora_object[$dsid]->controlGroup == 'X') {
+      header('Content-length: ' . $fedora_object[$dsid]->size);
+    }
+    header("Cache-control: private");
+    $method = arg(5);
+    if (isset($method) && $method == 'download') {
+      header("Content-Disposition: attachment; filename=\"" . $fedora_object[$dsid]->label);
+    }
+    print($fedora_object[$dsid]->content);
+    exit();
   } catch (Exception $e) {
-    drupal_set_message(t('Error getting Islanndora datastream $d for object %s', array('%s' => $object_id, '%d' => $dsid)), 'error');
+    return drupal_not_found();
-    return"";
-  }
-  header('Content-type: ' . $fedora_object[$dsid]->mimetype);
-  if($fedora_object[$dsid]->controlGroup == 'M' || $fedora_object[$dsid]->controlGroup == 'X') {
-    header('Content-length: ' . $fedora_object[$dsid]->size);
   }
-  header("Cache-control: private");
-  $method = arg(5);
-  if (isset($method) && $method == 'download') {
-    header("Content-Disposition: attachment; filename=\"" . $fedora_object[$dsid]->label);
-  }
-  print($fedora_object[$dsid]->content);
-  exit();
 }
 
 function islandora_get_datastream_parents($islandora_object) {
@@ -210,27 +215,30 @@ function islandora_get_add_datastream_form($object_id, &$form_state) {
  */
 function islandora_add_datastream_form_submit($form, &$form_state) {
   global $base_url;
+  module_load_include('inc', 'islandora', 'RestConnection');
   if (!empty($form_state['submit']) && $form_state['submit'] == 'OK') {
     $form_state['rebuild'] = TRUE;
     return;
   }
 
+  module_load_include('inc', 'islandora', 'includes/MimeClass');
+  $mimetype = new MimeClass();
+  
   $file = $form_state['values']['add-stream-file-location'];
   $file = drupal_realpath($file);
+
   $object_id = $form_state['values']['pid'];
   $dsid = $form_state['values']['stream_id'];
-  $ds_label = $form_state['values']['stream_label']; // Add the file extention to the end of the label.;
+  $ds_label = $form_state['values']['stream_label'];
-  //$dformat = $mimetype->getType($file);
+  $dformat = $mimetype->getMimeType($file);
   $controlGroup = "M";
-  //if ($dformat == 'text/xml') {
+
-  //  $controlGroup = 'X';
-  //}
-  global $user;
   try {
-    $restConnection = new RestConnection($user);
+    $restConnection = new RestConnection();
-    $fedora_object = new FedoraObject($object_id, $restConnection->repository);
+    $fedora_object = $restConnection->repository->getObject($object_id);
     $ds = $fedora_object->constructDatastream($dsid, $controlGroup);
     $ds->label = $ds_label;
+    $ds->mimetype = $dformat;
     $ds->setContentFromFile($file);
     $fedora_object->ingestDatastream($ds);
     $d_file = file_load($form_state['values']['fid']);
@@ -239,7 +247,8 @@ function islandora_add_datastream_form_submit($form, &$form_state) {
     drupal_set_message(t('@message', array('@message' => check_plain($e->getMessage()))), 'error');
     return;
   }
-  $form_state['rebuild'] = TRUE;
+  drupal_set_message("Successfully Added Datastream!");
+  drupal_goto("islandora/object/$object_id");
 }
 
 /**
@@ -251,6 +260,7 @@ function islandora_add_datastream_form_submit($form, &$form_state) {
  */
 function islandora_add_datastream_form_validate($form, &$form_state) {
   module_load_include('inc', 'islandora', 'includes/MimeClass');
+  module_load_include('inc', 'islandora', 'RestConnection');
   $mimetype = new MimeClass();
   if ($form_state['clicked_button']['#value'] == 'OK') {
     $form_state['rebuild'] = TRUE;
@@ -274,13 +284,32 @@ function islandora_add_datastream_form_validate($form, &$form_state) {
     form_set_error('', t('Data stream Label cannot contain a "/".'));
     return FALSE;
   }
+
+  $object_id = $form_state['values']['pid'];
+  $restConnection = new RestConnection();
+  $fedora_object = $restConnection->repository->getObject($object_id);
+
+  if(isset($fedora_object[$dsid])) {
+    form_set_error('', t('Data stream ID already exists in object.'));
+    return FALSE;
+  }
+
   $mimetype = new MimeClass();
   $unused_dsids = islandora_get_unused_dsids($form_state['values']['pid']);
-  $types_allowed = $unused_dsids[$dsid];
+  if(isset($unused_dsids[$dsid])) {
-  $arr = array();
+    $types_allowed = $unused_dsids[$dsid];
-  foreach ($types_allowed as $type) {
+    $arr = array();
-    $arr[] = $mimetype->getExtension($type);
+    foreach ($types_allowed as $type) {
+      $arr[] = $mimetype->getExtension($type);
+    }
+  }
+  else {
+    // todo: this is unsafe, should probably be fixed see:
+    // http://api.drupal.org/api/drupal/includes!file.inc/function/file_save_upload/7
+    $arr = array();
   }
+  
+
   $file = file_save_upload('add-stream-file-location', array('file_validate_extensions' => $arr));
   if ($file) {
     $form_state['values']['add-stream-file-location'] = $file->uri;
@@ -339,32 +368,44 @@ function islandora_add_datastream_form($form, &$form_state, $object_id) {
     '#value' => t('Add Datastream')
   );
 
-  if (!empty($unused_dsids)) {
+  $unused_dsids = islandora_get_unused_dsids($object_id);
-    $dsidsForForm = array();
+  $dsidsForForm = '';
-    foreach ($unused_dsids as $key => $value) {
+  $i = 0;
-      $dsidsForForm[$key] = $key;
+  foreach ($unused_dsids as $key => $value) {
+    if($i++) {
+      $dsidsForForm .= ", ";
     }
-    $form['add_fieldset']['stream_id'] = array(
+    $dsidsForForm .= "'$key'";
-      '#type' => 'select',
-      '#title' => t('Datastream ID'),
-      '#default_value' => variable_get('feed_item_length', 'teaser'),
-      '#weight' => '-1',
-      '#description' => t('Datastream IDs defined by the content model.'),
-    );
-    $form['add_fieldset']['stream_id']['#options'] = $dsidsForForm;
-  }
-  else {
-    $form['add_fieldset']['stream_id'] = array(
-      '#title' => 'Datastream ID',
-      '#required' => 'TRUE',
-      '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores.'),
-      '#type' => 'textfield',
-      '#weight' => -1,
-    );
   }
+
+  $form['add_fieldset']['stream_id'] = array(
+    '#title' => 'Datastream ID',
+    '#required' => 'TRUE',
+    '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores. Datastreams that are defined by the content model dont currently exist: <b>' . $dsidsForForm . '</b>.'),
+    '#type' => 'textfield',
+    '#weight' => -1,
+    '#autocomplete_path' => "islandora/object/$object_id/manage/datastreams/add/autocomplete",
+  );
   return $form;
 }
 
+function islandora_datastream_autocomplete_callback($object_id, $string = '') {
+  $dsids = islandora_get_unused_dsids($object_id);
+  $output = array();
+  foreach($dsids as $id => $ds) {
+    if(trim($string) == '') {
+      $output[$id] = $id;
+    }
+    else {
+      $ret = stripos($id, $string);
+      if($ret !== FALSE) {
+        $output[$id] = $id;
+      }
+    }
+  }
+  drupal_json_output($output);
+}
+
 function islandora_datastream_get_human_readable_size($ds) {
   module_load_include('inc', 'islandora', 'includes/utilities');
 

islandora.module

@@ -170,16 +170,13 @@ function islandora_menu() {
     'access arguments' => array(FEDORA_ADD_DS)
   );
 
-
+  $items['islandora/object/%/manage/datastreams/add/autocomplete'] = array(
-  // $items['islandora/object/%/add'] = array(
+    'file' => 'includes/datastream.inc',
-  //   'title' => 'Add to an object',
+    'page callback' => 'islandora_datastream_autocomplete_callback',
-  //   'file' => 'includes/datastream.inc',
+    'page arguments' => array(2),
-  //   'page callback' => 'drupal_get_form',
+    'type' => MENU_CALLBACK,
-  //   'page arguments' => array('islandora_add_datastream_form',2),
+    'access arguments' => array(FEDORA_ADD_DS)
-  //   'type' => MENU_NORMAL_ITEM,
+  );
-  //   'access arguments' => array(FEDORA_ADD_DS)
-  // );
-
 
   $items['islandora/object/%/datastream/%'] = array(
     'title' => 'View datastream',
@@ -484,6 +481,8 @@ function islandora_view_default_object() {
  * @return string 
  */
 function islandora_view_object($object_id = NULL) {
+  module_load_include('inc', 'islandora', 'includes/Breadcrumbs');
+  drupal_set_breadcrumb(islandora_get_breadcrumbs($object_id));
   //return $object_id;
   if (!isset($object_id)) {
     $object_id = variable_get('islandora_repository_pid', 'islandora:root');

islandora_basic_collection/includes/ChangeContentModels.inc

@@ -28,7 +28,7 @@ function islandora_change_content_models_form($form, &$form_state, $collection_p
   $collection_policy_datastream = $collection_object->getDatastream($collection_policy_dsid);
 
   $supported_collection_models = array();
-  if ($collection_policy_datastream->content) {
+  if ($collection_policy_datastream && $collection_policy_datastream->content) {
     $collection_policy = new CollectionPolicy($collection_policy_datastream->content);
     $supported_collection_models = $collection_policy->getContentModels();
   }

islandora_basic_collection/includes/ChildCollection.inc

@@ -86,18 +86,15 @@ function islandora_create_child_collection_form_validate($form, &$form_state) {
 }
 
 function islandora_create_child_collection_form_submit($form, &$form_state) {
-  global $base_root;
+  global $base_url;
   module_load_include('inc', 'islandora', '/includes/islandora.ingest');
-    $thumbnail = $base_root . '/' . drupal_get_path('module', 'islandora_basic_collection') . '/Crystal_Clear_filesystem_folder_grey.png';
+    $thumbnail = $base_url . '/' . drupal_get_path('module', 'islandora_basic_collection') . '/Crystal_Clear_filesystem_folder_grey.png';
     $new_collection_pid = $form_state['values']['new_collection_pid'];
     $new_collection_label = $form_state['values']['collection_name'];
     $namespace = $form_state['values']['collection_namespace'];
 //    $all_cModels = get_content_models_as_option_array();
-    $content_models = array('islandora:collectionCModel');
+    $content_models = array(array('pid' => 'islandora:collectionCModel'));
-    $relationship = array(
+    $relationship = 'isMemberOfCollection';
-      'uri' => FEDORA_RELS_EXT_URI,
-      'value' => 'isMemberOfCollection',
-    );
 
     $fedora_object = islandora_ingest_get_object($content_models, $form_state['values']['current'], $relationship, $new_collection_pid);
     $fedora_object->label = $new_collection_label;