Browse Source

Fixed child collection

pull/25/head
Ben Woodhead 13 years ago
parent
commit
4ec1743465
  1. BIN
      .CollectionClass.inc.swp
  2. 11
      CollectionClass.inc

BIN
.CollectionClass.inc.swp

Binary file not shown.

11
CollectionClass.inc

@ -715,6 +715,7 @@ function collection_creation_form(&$form_state, $parent_collection_pid) {
'#title' => "Choose allowable content models for this collection", '#title' => "Choose allowable content models for this collection",
'#type' => 'checkboxes', '#type' => 'checkboxes',
'#options' => $content_models, '#options' => $content_models,
'#required' => true,
'#description' => t("Content models describe the behaviours of objects with which they are associated."), '#description' => t("Content models describe the behaviours of objects with which they are associated."),
); );
@ -736,12 +737,17 @@ function collection_creation_form(&$form_state, $parent_collection_pid) {
*/ */
function collection_creation_form_validate($form, &$form_state) { function collection_creation_form_validate($form, &$form_state) {
module_load_include('inc', 'fedora_repository', 'api/fedora_item'); module_load_include('inc', 'fedora_repository', 'api/fedora_item');
module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
$pid = $form_state['values']['collection_pid']; $pid = $form_state['values']['collection_pid'];
$item = new fedora_item($pid); $item = new fedora_item($pid);
if ($item->exists()) { if ($item->exists()) {
drupal_set_message("$pid already exists within your repository. the PID must be unique", 'warning'); form_set_error('', t("$pid already exists within your repository. the PID must be unique"));
return; return;
} }
if (!valid_pid($pid)){
form_set_error('', t("$pid is not a valid identifier"));
return;
}
} }
/** /**
@ -759,6 +765,7 @@ function collection_creation_form_submit($form, &$form_state) {
$collection_pid = $form_state['values']['collection_pid']; $collection_pid = $form_state['values']['collection_pid'];
$new_collection_label = $form_state['values']['collection_name']; $new_collection_label = $form_state['values']['collection_name'];
$parent_collection = $form_state['values']['parent_collection']; $parent_collection = $form_state['values']['parent_collection'];
$pid_namespace = $form_state['values']['collection_namespace'];
$all_cModels = get_content_models_as_option_array(); $all_cModels = get_content_models_as_option_array();
$collection_policy = '<?xml version="1.0" encoding="UTF-8"?> $collection_policy = '<?xml version="1.0" encoding="UTF-8"?>
<collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd"> <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
@ -776,7 +783,7 @@ function collection_creation_form_submit($form, &$form_state) {
$node = $collection_policy_xml->content_models->addChild('content_model'); $node = $collection_policy_xml->content_models->addChild('content_model');
$node->addAttribute('dsid', 'ISLANDORACM'); $node->addAttribute('dsid', 'ISLANDORACM');
$node->addAttribute('name', $all_cModels[$content_model]); $node->addAttribute('name', $all_cModels[$content_model]);
$node->addAttribute('namespace', $pid_namespace . '1'); $node->addAttribute('namespace', $pid_namespace . ':1');
$node->addAttribute('pid', $content_model); $node->addAttribute('pid', $content_model);
} }
} }

Loading…
Cancel
Save