Browse Source

reverted auto-formatting

pull/307/head
Alan Stanley 12 years ago
parent
commit
273e591f6e
  1. 30
      includes/utilities.inc

30
includes/utilities.inc

@ -124,7 +124,8 @@ function islandora_describe_repository($url = NULL) {
try {
$info = $connection->api->a->describeRepository();
return $info;
} catch (RepositoryException $e) {
}
catch (RepositoryException $e) {
return FALSE;
}
}
@ -203,13 +204,13 @@ function islandora_escape_pid_for_function($pid) {
// Apparently, case doesn't matter for function calls in PHP, so let's not
// really worry about changing the case.
return str_replace(
// Any PID characters which are not valid in the name of a PHP function.
array(
':',
'-',
),
'_',
$pid
// Any PID characters which are not valid in the name of a PHP function.
array(
':',
'-',
),
'_',
$pid
);
}
@ -280,15 +281,16 @@ function islandora_namespace_accessible($id) {
function islandora_get_parents_from_rels_ext(FedoraObject $object) {
try {
$collections = array_merge(
$object->relationships->get(FEDORA_RELS_EXT_URI, 'isMemberOfCollection'),
$object->relationships->get(FEDORA_RELS_EXT_URI, 'isMemberOf'));
} catch (RepositoryException $e) {
$object->relationships->get(FEDORA_RELS_EXT_URI, 'isMemberOfCollection'),
$object->relationships->get(FEDORA_RELS_EXT_URI, 'isMemberOf'));
}
catch (RepositoryException $e) {
// @todo some logging would be nice, not sure what this throws.
return array();
}
$map = function($o) {
return islandora_object_load($o['object']['value']);
};
return islandora_object_load($o['object']['value']);
};
$collections = array_map($map, $collections);
return array_filter($collections);
}
@ -503,7 +505,7 @@ function islandora_display_repository_inaccessible_message() {
$text = t('Islandora configuration');
$link = l($text, 'admin/islandora/configure', array('attributes' => array('title' => $text)));
$message = t('Could not connect to the repository. Please check the settings on the !link page.',
array('!link' => $link));
array('!link' => $link));
drupal_set_message($message, 'error', FALSE);
}

Loading…
Cancel
Save