Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Removed info:fedora from everything

pull/110/head
jonathangreen 13 years ago
parent
d1992386fe
commit
a1e6fafd92
2 changed files with 9 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

6
islandora_basic_image/islandora_basic_image.module
Unescape View File

@ -53,13 +53,13 @@ function islandora_basic_image_theme($existing, $type, $theme, $path) {
*/ */
function islandora_basic_image_islandora_get_types() { function islandora_basic_image_islandora_get_types() {
$types = array(); $types = array();
$types['info:fedora/islandora:sp_basic_image'][ISLANDORA_VIEW_HOOK] = TRUE; $types['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_EDIT_HOOK] = FALSE;
return $types; 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 * as registered in its return types
* Other modules would handle objects of other types. * Other modules would handle objects of other types.
* @param Object $object * @param Object $object

Write Preview
Loading…
Cancel
Save