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

coder cleanup

pull/166/head
DannyJoris 12 years ago
parent
58c6a3a667
commit
7f0208d44b
3 changed files with 19 additions and 19 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. 30
      includes/solution_packs.inc
  2. 2
      islandora.install
  3. 6
      islandora.module

30
includes/solution_packs.inc
Unescape View File

@ -15,7 +15,7 @@ function islandora_solution_packs_admin() {
$info = islandora_describe_repository($url); $info = islandora_describe_repository($url);
if (!$info) { if (!$info) {
$config_url = url('admin/islandora/configure'); $config_url = url('admin/islandora/configure');
drupal_set_message(t('Could not connect to the repository. Please check the settings on the <a href="!config_url" title="Islandora configuration page">Islandora configuration</a> page.', array('!config_url' => $config_url)), 'error'); drupal_set_message(t('Could not connect to the repository. Please check the settings on the <a href="@config_url" title="Islandora configuration page">Islandora configuration</a> page.', array('@config_url' => $config_url)), 'error');
} }
// set variables // set variables
@ -295,7 +295,7 @@ function islandora_batch_reingest_object($object_model, &$context) {
function islandora_install_solution_pack($module_name = NULL, $op = 'install') { function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
// check if a module name is given. // @TODO: check module name for existance // check if a module name is given. // @TODO: check module name for existance
if (!empty($module_name)) { if (!empty($module_name)) {
// include files // include files
module_load_include('inc', 'islandora', 'includes/tuque'); module_load_include('inc', 'islandora', 'includes/tuque');
module_load_include('module', 'islandora', 'islandora'); module_load_include('module', 'islandora', 'islandora');
@ -306,7 +306,7 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
// set globals // set globals
global $base_url; global $base_url;
global $user; global $user;
// set variables // set variables
$sp_admin = url($base_url . '/admin/islandora/solution_packs'); $sp_admin = url($base_url . '/admin/islandora/solution_packs');
$config_url = url('admin/islandora/configure'); $config_url = url('admin/islandora/configure');
@ -315,7 +315,7 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
$info_file = drupal_get_path('module', $module_name) . '/' . $module_name . '.info'; $info_file = drupal_get_path('module', $module_name) . '/' . $module_name . '.info';
$info_array = drupal_parse_info_file($info_file); $info_array = drupal_parse_info_file($info_file);
$module_label = $info_array['name']; $module_label = $info_array['name'];
// check connection // check connection
$url = variable_get('islandora_base_url', 'http://localhost:8080/fedora'); $url = variable_get('islandora_base_url', 'http://localhost:8080/fedora');
$info = islandora_describe_repository($url); $info = islandora_describe_repository($url);
@ -323,11 +323,11 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
// operation // operation
switch ($op) { switch ($op) {
case 'install': case 'install':
drupal_set_message(st('@module_label: Did not install any objects. Could not connect to the repository. Please check the settings on the <a href="!config_url" title="Islandora configuration page">Islandora configuration</a> page and install the required objects manually on the <a href="!sp_url" title="Solution pack admin">solution pack admin</a> page.', array('@module_label' => $module_label, '!config_url' => $config_url, '!sp_url' => $sp_admin)), 'error'); drupal_set_message(st('@module_label: Did not install any objects. Could not connect to the repository. Please check the settings on the <a href="@config_url" title="Islandora configuration page">Islandora configuration</a> page and install the required objects manually on the <a href="@sp_url" title="Solution pack admin">solution pack admin</a> page.', array('@module_label' => $module_label, '@config_url' => $config_url, '@sp_url' => $sp_admin)), 'error');
break; break;
case 'uninstall': case 'uninstall':
drupal_set_message(st('@module_label: Did not uninstall any objects. Could not connect to the repository. Please check the settings on the <a href="!config_url" title="Islandora configuration page">Islandora configuration</a> page and uninstall the required objects manually if necessary.', array('@module_label' => $module_label, '!config_url' => $config_url, '!sp_url' => $sp_admin)), 'error'); drupal_set_message(st('@module_label: Did not uninstall any objects. Could not connect to the repository. Please check the settings on the <a href="@config_url" title="Islandora configuration page">Islandora configuration</a> page and uninstall the required objects manually if necessary.', array('@module_label' => $module_label, '@config_url' => $config_url)), 'error');
break; break;
} }
return; return;
@ -355,26 +355,26 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
$label = isset($object['label']) ? $object['label'] : st('Object'); $label = isset($object['label']) ? $object['label'] : st('Object');
// check if object already exists // check if object already exists
$query = $connection->api->a->findObjects('query', 'pid=' . $pid); $query = $connection->api->a->findObjects('query', 'pid=' . $pid);
// object url
$object_url = url($base_url . '/islandora/object/' . $pid);
// operation: install or uninstall // operation: install or uninstall
switch ($op) { switch ($op) {
case 'install': case 'install':
// if object exists, don't re-ingest // if object exists, don't re-ingest
if (!empty($query['results'])) { if (!empty($query['results'])) {
// object url
$object_url = url($base_url . '/islandora/object/' . $pid);
// check object status // check object status
$object_status = islandora_check_object_status($object); $object_status = islandora_check_object_status($object);
// set messages // set messages
switch ($object_status) { switch ($object_status) {
case 'up_to_date': case 'up_to_date':
drupal_set_message(st('@module_label: did not install <a href="!url" title="@pid">@label</a>. The object already exists and is up-to-date.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '!url' => $object_url))); drupal_set_message(st('@module_label: did not install <a href="@object_url" title="@pid">@label</a>. The object already exists and is up-to-date.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '@object_url' => $object_url)));
break; break;
case 'missing_datastream': case 'missing_datastream':
drupal_set_message(st('@module_label: did not install <a href="!url" title="@pid">@label</a>. The object already exists but is missing a datastream. Please reinstall the object on the <a href="!sp_admin" title="Solution pack admin page">solution pack admin page</a>.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '!url' => $object_url, '!sp_admin' => $sp_admin)), 'warning'); drupal_set_message(st('@module_label: did not install <a href="@object_url" title="@pid">@label</a>. The object already exists but is missing a datastream. Please reinstall the object on the <a href="@sp_admin" title="Solution pack admin page">solution pack admin page</a>.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '@objecturl' => $object_url, '@sp_admin' => $sp_admin)), 'warning');
break; break;
case 'out_of_date': case 'out_of_date':
drupal_set_message(st('@module_label: did not install <a href="!url" title="@pid">@label</a>. The object already exists but is out-of-date. Please update the object on the <a href="!sp_admin" title="Solution pack admin page">solution pack admin page</a>.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '!url' => $object_url, '!sp_admin' => $sp_admin)), 'warning'); drupal_set_message(st('@module_label: did not install <a href="@object_url" title="@pid">@label</a>. The object already exists but is out-of-date. Please update the object on the <a href="@sp_admin" title="Solution pack admin page">solution pack admin page</a>.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '@object_url' => $object_url, '@sp_admin' => $sp_admin)), 'warning');
break; break;
} }
} }
@ -382,7 +382,7 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
// build and ingest new object // build and ingest new object
islandora_ingest_new_object($object); islandora_ingest_new_object($object);
// set message // set message
drupal_set_message(st('@module_label: installed <a href="!url" title="@pid">@label</a> object.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid))); drupal_set_message(st('@module_label: installed <a href="@object_url" title="@pid">@label</a> object.', array('@module_label' => $module_label, '@label' => $label, '@pid' => $pid, '@object_url' => $object_url)));
} }
break; break;
@ -390,7 +390,7 @@ function islandora_install_solution_pack($module_name = NULL, $op = 'install') {
// if object exists, set message // if object exists, set message
if (!empty($query['results'])) { if (!empty($query['results'])) {
$object_url = url($base_url . '/islandora/object/' . $pid); $object_url = url($base_url . '/islandora/object/' . $pid);
drupal_set_message(st('@module_label: did not remove <a href="!object_url" title="@pid">@label</a>. It may be used by other sites.', array('@pid' => $pid, '!object_url' => $object_url, '@label' => $label, '@module_label' => $module_label)), 'warning'); drupal_set_message(st('@module_label: did not remove <a href="@object_url" title="@pid">@label</a>. It may be used by other sites.', array('@pid' => $pid, '@object_url' => $object_url, '@label' => $label, '@module_label' => $module_label)), 'warning');
} }
break; break;
} }
@ -466,7 +466,7 @@ function islandora_check_object_status($object_model = array()) {
// Check if the datastream is versioned and needs updating. // Check if the datastream is versioned and needs updating.
$installed_version = islandora_get_islandora_datastream_version($object, $ds['dsid']); $installed_version = islandora_get_islandora_datastream_version($object, $ds['dsid']);
$available_version = islandora_get_islandora_datastream_version(NULL, NULL, $ds['datastream_file']); $available_version = islandora_get_islandora_datastream_version(NULL, NULL, $ds['datastream_file']);
if ($available_version > $installed_version) { if ($available_version > $installed_version) {
$object_status = 'out_of_date'; $object_status = 'out_of_date';
break; break;

2
islandora.install
Unescape View File

@ -4,7 +4,7 @@
* @file * @file
* This file contains all install functions. * This file contains all install functions.
*/ */
/** /**
* Implements hook_install(). * Implements hook_install().
* *

6
islandora.module
Unescape View File

@ -491,7 +491,7 @@ function islandora_object_purge($object_id) {
drupal_set_message(t('Cannot remove object, object id not set')); drupal_set_message(t('Cannot remove object, object id not set'));
return; return;
} }
// load object // load object
$object = islandora_object_load($object_id); $object = islandora_object_load($object_id);
@ -574,7 +574,7 @@ function islandora_islandora_required_objects() {
// module path // module path
$module_path = drupal_get_path('module', 'islandora'); $module_path = drupal_get_path('module', 'islandora');
return array( return array(
'islandora' => array( 'islandora' => array(
'title' => 'Islandora', 'title' => 'Islandora',
@ -593,7 +593,7 @@ function islandora_islandora_required_objects() {
), ),
array( array(
'dsid' => 'TN', 'dsid' => 'TN',
'label' => 'Thumbnail', 'label' => 'Thumbnail',
'mimetype' => 'image/png', 'mimetype' => 'image/png',
'control_group' => 'M', 'control_group' => 'M',
'datastream_file' => "$module_path/images/folder.png", 'datastream_file' => "$module_path/images/folder.png",

Write Preview
Loading…
Cancel
Save