Browse Source

Removed info:fedora from everything

pull/110/head
jonathangreen 13 years ago
parent
commit
a1e6fafd92
  1. 14
      islandora_basic_collection/islandora_basic_collection.module
  2. 6
      islandora_basic_image/islandora_basic_image.module

14
islandora_basic_collection/islandora_basic_collection.module

@ -48,11 +48,10 @@ function islandora_basic_collection_theme($existing, $type, $theme, $path) {
* array of content model pids that this module supports
*/
function islandora_basic_collection_islandora_get_types() {
$types = array();
$types['info:fedora/islandora:collectionCModel'][ISLANDORA_VIEW_HOOK] = TRUE;
$types['info:fedora/islandora:collectionCModel'][ISLANDORA_EDIT_HOOK] = FALSE;
$types = array();
$types['islandora:collectionCModel'][ISLANDORA_VIEW_HOOK] = TRUE;
$types['islandora:collectionCModel'][ISLANDORA_EDIT_HOOK] = FALSE;
return $types;
}
/**
@ -72,7 +71,7 @@ function islandora_basic_collection_islandora_view_object($object, $user, $page_
$cmodel_list = islandora_basic_collection_islandora_get_types();
$models = $object->models;
foreach ($object->models as $model) {
if (isset($cmodel_list[$model][ISLANDORA_VIEW_HOOK]) && $cmodel_list[$model][ISLANDORA_VIEW_HOOK] == TRUE) {
if (isset($cmodel_list[$model][ISLANDORA_VIEW_HOOK]) && $cmodel_list[$model][ISLANDORA_VIEW_HOOK] == TRUE) {
$output = theme('islandora_basic_collection', array('islandora_object' => $object));
return array('Basic Collection Output' => $output);
}
@ -138,7 +137,7 @@ function islandora_basic_collection_get_objects($object) {
}
function islandora_basic_collection_islandora_ingest_get_information($models, $object) {
if(in_array('info:fedora/islandora:collectionCModel', $models) && isset($object['COLLECTION_POLICY'])) {
if (in_array('islandora:collectionCModel', $models) && isset($object['COLLECTION_POLICY'])) {
try {
module_load_include('inc', 'islandora_basic_collection', 'includes/CollectionPolicy');
$return = array();
@ -147,8 +146,7 @@ function islandora_basic_collection_islandora_ingest_get_information($models, $o
$return['relationship'] = $policy->getRelationship();
return $return;
}
catch (Exception $e) {
} catch (Exception $e) {
drupal_set_message(t('Islandora Error getting collection info for %s', array('%s' => $object->id)), 'error');
}
}

6
islandora_basic_image/islandora_basic_image.module

@ -53,13 +53,13 @@ function islandora_basic_image_theme($existing, $type, $theme, $path) {
*/
function islandora_basic_image_islandora_get_types() {
$types = array();
$types['info:fedora/islandora:sp_basic_image'][ISLANDORA_VIEW_HOOK] = TRUE;
$types['info:fedora/islandora:sp_basic_image'][ISLANDORA_EDIT_HOOK] = FALSE;
$types['islandora:sp_basic_image'][ISLANDORA_VIEW_HOOK] = TRUE;
$types['islandora:sp_basic_image'][ISLANDORA_EDIT_HOOK] = FALSE;
return $types;
}
/**
* this modules implentation of view_object hook will handle objects of type islandora:basicImageCModel and info:fedora/islandora:sp_basic_image
* this modules implentation of view_object hook will handle objects of type islandora:basicImageCModel and islandora:sp_basic_image
* as registered in its return types
* Other modules would handle objects of other types.
* @param Object $object

Loading…
Cancel
Save