foreach ($resultelements->resultList->objectFields as $obj) {
foreach ($resultelements->resultList->objectFields as $obj) {
$ret = (string)$obj->title;
$ret = (string) $obj->title;
if (count($resultFields) > 0) {
if (count($resultFields) > 0) {
$ret = array('title' => $ret);
$ret = array('title' => $ret);
foreach ($resultFields as $field) {
foreach ($resultFields as $field) {
$ret[$field]=(string)$obj->$field;
$ret[$field] = (string) $obj->$field;
}
}
}
}
$results[(string)$obj->pid] = $ret;
$results[(string)$obj->pid] = $ret;
$cursor++;
$cursor++;
if ($cursor >= $max_results) {
if ($cursor >= $max_results) {
$done = TRUE;
$done = TRUE;
@ -365,6 +366,7 @@ class Fedora_Item {
//}
//}
return $this->datastreams_list;
return $this->datastreams_list;
}
}
/**
/**
* * DatastreamControlGroup controlGroup - String restricted to the values of "X", "M", "R", or "E" (InlineXML,Managed Content,Redirect, or External Referenced).
* * DatastreamControlGroup controlGroup - String restricted to the values of "X", "M", "R", or "E" (InlineXML,Managed Content,Redirect, or External Referenced).
* String ID - The datastream ID (64 characters max).
* String ID - The datastream ID (64 characters max).
@ -386,7 +388,7 @@ class Fedora_Item {
* @return datastream object
* @return datastream object
* get the mimetype size etc. in one shot. instead of iterating throught the datastream list for what we need
* get the mimetype size etc. in one shot. instead of iterating throught the datastream list for what we need
*/
*/
function get_datastream_info($dsid,$as_of_date_time = ""){
function get_datastream_info($dsid,$as_of_date_time = ""){
drupal_set_message(t('Error following Content Model Rules'), 'error');
drupal_set_message(t('Error following Content Model Rules'), 'error');
foreach (ContentModel::$errors as $err) {
foreach (ContentModel::$errors as $err) {
drupal_set_message($err, 'error');
drupal_set_message($err, 'error');
@ -262,7 +264,8 @@ function fedora_repository_purge_object_form(&$form_state, $pid, $referrer) {
//$form['#redirect'] = $referrer;
//$form['#redirect'] = $referrer;
return $form;
return $form;
} else {
}
else {
// ALSO do $form definition here. Your final submit handler (after user clicks Yes, I Confirm) will only see $form_state info defined here. Form you create here passed as param1 to confirm_form
// ALSO do $form definition here. Your final submit handler (after user clicks Yes, I Confirm) will only see $form_state info defined here. Form you create here passed as param1 to confirm_form
return confirm_form($form, 'Confirm Purge Object', $referrer, 'Are you sure you want to delete this object? This action cannot be undone.', 'Delete', 'Cancel'); //Had better luck leaving off last param 'name'
return confirm_form($form, 'Confirm Purge Object', $referrer, 'Are you sure you want to delete this object? This action cannot be undone.', 'Delete', 'Cancel'); //Had better luck leaving off last param 'name'
@ -407,7 +410,8 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
if (!isset($form_state['storage']['confirm'])) {
if (!isset($form_state['storage']['confirm'])) {
$form_state['storage']['confirm'] = TRUE; // this will cause the form to be rebuilt, entering the confirm part of the form
$form_state['storage']['confirm'] = TRUE; // this will cause the form to be rebuilt, entering the confirm part of the form
$form_state['rebuild'] = TRUE; // along with this
$form_state['rebuild'] = TRUE; // along with this
} else {
}
else {
// this is where you do your processing after they have pressed the confirm button
// this is where you do your processing after they have pressed the confirm button
$params = array(
$params = array(
"pid" => $pid,
"pid" => $pid,
@ -422,7 +426,8 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
} catch (exception $e) {
} catch (exception $e) {
if (preg_match('/org\.fcrepo\.server\.security\.xacml\.pep\.AuthzDeniedException/', $e->getMessage())) {
if (preg_match('/org\.fcrepo\.server\.security\.xacml\.pep\.AuthzDeniedException/', $e->getMessage())) {
drupal_set_message(t('Error: Insufficient permissions to purge object.'), 'error');
drupal_set_message(t('Error: Insufficient permissions to purge object.'), 'error');
} else {
}
else {
drupal_set_message(t($e->getMessage()), 'error');
drupal_set_message(t($e->getMessage()), 'error');
}
}
return;
return;
@ -432,7 +437,8 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
'#value' => '<p>If you install the ' . l('fedora demo objects', 'https://wiki.duraspace.org/display/FCR30/Demonstration+Objects') . ' Islandora can display them as a collection.</p>'
'#value' => '<p>If you install the ' . l('fedora demo objects', 'https://wiki.duraspace.org/display/FCR30/Demonstration+Objects') . ' Islandora can display them as a collection.</p>'
);
);
@ -1531,7 +1543,8 @@ function fedora_repository_basket_form($form_state, $pids) {
$form['pid'] = array();
$form['pid'] = array();
$form['title'] = array();
$form['title'] = array();
$form['desc'] = array();
$form['desc'] = array();
} else {
}
else {
return;
return;
}
}
@ -1589,7 +1602,8 @@ function theme_fedora_repository_basket_form($form) {
'#description' => t('A space separated list PID namespaces that users are permitted to access from this Drupal installation. <br/> This could be more than a simple namespace ie demo:mydemos.'),
'#description' => t('A space separated list PID namespaces that users are permitted to access from this Drupal installation. <br/> This could be more than a simple namespace ie demo:mydemos.'),
'#weight' => 0
'#weight' => 0
);
);
/*
}
$form['fedora_admin_user'] = array(
else {
$form['fedora_pids_allowed'] = array(
'#type' => 'textfield',
'#type' => 'textfield',
'#title' => t('A user with the Drupal role administrator'),
'#title' => t('PID namespaces allowed in this Drupal install'),
'#description' => t('A user with the administrator role. This is the user the Islandora module will use when admin access is needed for a task, such as creating a collection object for a new user.'),
'#description' => t('A space separated list PID namespaces that users are permitted to access from this Drupal installation. <br/> This could be more than a simple namespace ie demo:mydemos.'),
'#description' => t('The title displayed when viewing collections and objects in /fedora/repository. Leave blank to display no title. Note that the menus must be rebuilt after changing this variable.'),
'#description' => t('The title displayed when viewing collections and objects in /fedora/repository. Leave blank to display no title. Note that the menus must be rebuilt after changing this variable.'),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#description' => t('Determines when to display the object (or collection) title when viewing an object/collection page.'),
'#description' => t('Determines when to display the object (or collection) title when viewing an object/collection page.'),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#description' => t('Determines when to display the default object (or collection) description fieldset when viewing an object/collection page.'),
'#description' => t('Determines when to display the default object (or collection) description fieldset when viewing an object/collection page.'),
'#description' => t('When enabled, restricts access to fedora object datastreams that are not listed in the Islandora Content Model for the object (unless the user is an administrator).'),
'#description' => t('When enabled, restricts access to fedora object datastreams that are not listed in the Islandora Content Model for the object (unless the user is an administrator).'),
);
);
$form['fedora_collection_display_list'] = array(
$form['fedora_collection_display_list'] = array(
'#type' => 'select',
'#type' => 'select',
'#title' => t('Display Collection List Behaviour'),
'#title' => t('Display Collection List Behaviour'),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#options' => array(ObjectHelper::$DISPLAY_ALWAYS=>t('Always'),ObjectHelper::$DISPLAY_NEVER=>t('Never'),ObjectHelper::$DISPLAY_NO_MODEL_OUTPUT=>t('Only if no Content Model display output.')),
'#description' => t('Determines when to display the list of objects when viewing a collection page.'),
'#description' => t('Determines when to display the list of objects when viewing a collection page.'),
);
);
//Export functionality
//Export functionality
$form['module']['export_area'] = array(
$form['module']['export_area'] = array(
'#type' => 'textfield',
'#type' => 'textfield',
@ -553,7 +513,6 @@ class formClass {
'#options' => $modelsForForm,
'#options' => $modelsForForm,
//'#description' => t('Content models available in this collection. A content model defines what is allowed in a collection and what to do with a file when it is uploaded (An example may creating a thumbnail from an image.).')
//'#description' => t('Content models available in this collection. A content model defines what is allowed in a collection and what to do with a file when it is uploaded (An example may creating a thumbnail from an image.).')
'#description' => t('Content models define datastream composition, relationships between this and other content models, and the mandatory behaviors associated with each digital object.<br/> Additional information may be found <ahref="https://wiki.duraspace.org/display/FEDORACREATE/Content+Models+Overview">here.</a> ')
'#description' => t('Content models define datastream composition, relationships between this and other content models, and the mandatory behaviors associated with each digital object.<br/> Additional information may be found <ahref="https://wiki.duraspace.org/display/FEDORACREATE/Content+Models+Overview">here.</a> ')
);
);
break;
break;
@ -658,15 +617,6 @@ class formClass {
'#type' => 'hidden',
'#type' => 'hidden',
'#value' => "$pid"
'#value' => "$pid"
);
);
/*
$form['stream_location'] = array (
'#title' => 'File Location',
'#required' => 'TRUE',
'#description' => 'The path to the file for the new datastream',
