';
foreach ($relationships as $rel) {
- if (empty($rel['subject']) || empty($rel['predicate']) || empty($rel['object']) || $rel['subject'] != 'info:fedora/'. $this->pid) {
+ if (empty($rel['subject']) || empty($rel['predicate']) || empty($rel['object']) || $rel['subject'] != 'info:fedora/' . $this->pid) {
// drupal_set_message should use parameterized variables, not interpolated.
- drupal_set_message("Error with relationship format: ". $rel['subject'] . " - ". $rel['predicate'] . ' - '. $rel['object'], "error");
+ drupal_set_message("Error with relationship format: " . $rel['subject'] . " - " . $rel['predicate'] . ' - ' . $rel['object'], "error");
return FALSE;
}
}
@@ -539,27 +543,28 @@ class Fedora_Item {
return $this->soap_call('purgeObject', $params);
}
- function purge_datastream( $dsID, $start_date = NULL, $end_date = NULL, $log_message = 'Purged datastream using Islandora API', $force = FALSE) {
+ function purge_datastream($dsID, $start_date = NULL, $end_date = NULL, $log_message = 'Purged datastream using Islandora API', $force = FALSE) {
$params = array(
'pid' => $this->pid,
'dsID' => $dsID,
'startDT' => $start_date,
'endDT' => $end_date,
'logMessage' => $log_message,
- 'force' => $force,
+ 'force' => $force,
);
return $this->soap_call('purgeDatastream', $params);
}
function url() {
global $base_url;
- return $base_url . '/fedora/repository/'. $this->pid . (!empty($this->objectProfile) ? '/-/'. drupal_urlencode($this->objectProfile->objLabel) : '');
+ return $base_url . '/fedora/repository/' . $this->pid . (!empty($this->objectProfile) ? '/-/' . drupal_urlencode($this->objectProfile->objLabel) : '');
}
- static function get_next_PID_in_namespace( $pid_namespace = '') {
+ static function get_next_PID_in_namespace($pid_namespace = '') {
+
if (empty($pid_namespace)) {
// Just get the first one in the config settings.
- $allowed_namespaces = explode(" ", variable_get('fedora_pids_allowed', 'default: demo: changeme: Islandora: ilives: '));
+ $allowed_namespaces = explode(" ", variable_get('fedora_pids_allowed', 'default: demo: changeme: islandora: ilives: '));
$pid_namespace = $allowed_namespaces[0];
if (!empty($pid_namespace)) {
$pid_namespace = substr($pid_namespace, 0, strpos($pid_namespace, ":"));
@@ -568,7 +573,7 @@ class Fedora_Item {
$pid_namespace = 'default';
}
}
-
+
$params = array(
'numPIDs' => '',
'pidNamespace' => $pid_namespace,
@@ -586,7 +591,7 @@ class Fedora_Item {
static function ingest_from_FOXML_file($foxml_file) {
$foxml = new DOMDocument();
- $foxml->load( $foxml_file );
+ $foxml->load($foxml_file);
return self::ingest_from_FOXML($foxml);
}
@@ -600,9 +605,9 @@ class Fedora_Item {
}
try {
- self::ingest_from_FOXML_file( $path . '/'. $file );
- }
- catch (exception $e) {
+ self::ingest_from_FOXML_file($path . '/' . $file);
+ } catch (exception $e) {
+
}
}
// Close
@@ -610,20 +615,20 @@ class Fedora_Item {
}
function modify_object($label = '', $state = null, $ownerId = null, $logMessage = 'Modified by Islandora API', $quiet=TRUE) {
-
- $params = array(
+
+ $params = array(
'pid' => $this->pid,
'ownerId' => $ownerId,
'state' => $state,
'label' => $label,
'logMessage' => $logMessage
);
-
- return self::soap_call('modifyObject', $params, $quiet);
+
+ return self::soap_call('modifyObject', $params, $quiet);
}
-
- function modify_datastream_by_reference($external_url, $dsid, $label, $mime_type, $force = FALSE, $logMessage = 'Modified by Islandora API',$quiet=FALSE) {
- $params = array(
+
+ function modify_datastream_by_reference($external_url, $dsid, $label, $mime_type, $force = FALSE, $logMessage = 'Modified by Islandora API', $quiet=FALSE) {
+ $params = array(
'pid' => $this->pid,
'dsID' => $dsid,
'altIDs' => NULL,
@@ -636,11 +641,11 @@ class Fedora_Item {
'logMessage' => $logMessage,
'force' => $force
);
- return self::soap_call('modifyDatastreamByReference', $params, $quiet);
+ return self::soap_call('modifyDatastreamByReference', $params, $quiet);
}
-
- function modify_datastream_by_value($content, $dsid, $label, $mime_type, $force = FALSE, $logMessage = 'Modified by Islandora API',$quiet=FALSE) {
- $params = array(
+
+ function modify_datastream_by_value($content, $dsid, $label, $mime_type, $force = FALSE, $logMessage = 'Modified by Islandora API', $quiet=FALSE) {
+ $params = array(
'pid' => $this->pid,
'dsID' => $dsid,
'altIDs' => NULL,
@@ -653,10 +658,10 @@ class Fedora_Item {
'logMessage' => $logMessage,
'force' => $force
);
- return self::soap_call('modifyDatastreamByValue', $params,$quiet);
+ return self::soap_call('modifyDatastreamByValue', $params, $quiet);
}
- static function soap_call( $function_name, $params_array, $quiet = FALSE ) {
+ static function soap_call($function_name, $params_array, $quiet = FALSE) {
if (!self::$connection_helper) {
module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
self::$connection_helper = new ConnectionHelper();
@@ -684,25 +689,25 @@ class Fedora_Item {
watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
return NULL;
}
- }
- catch (exception $e) {
- if (!$quiet) {
-
- if (preg_match('/org\.fcrepo\.server\.security\.xacml\.pep\.AuthzDeniedException/',$e->getMessage())) {
- drupal_set_message(t('Error: Insufficient permissions to call SOAP function !fn.', array('!fn' => $function_name) ), 'error');
- } else {
- drupal_set_message(t("Error trying to call SOAP function $function_name. Check watchdog logs for more information."), 'error');
- }
-
- watchdog(t("FEDORA_REPOSITORY"), t("Error Trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e)), NULL, WATCHDOG_ERROR);
- }
- return NULL;
+ } catch (exception $e) {
+ if (!$quiet) {
+
+ if (preg_match('/org\.fcrepo\.server\.security\.xacml\.pep\.AuthzDeniedException/', $e->getMessage())) {
+ drupal_set_message(t('Error: Insufficient permissions to call SOAP function !fn.', array('!fn' => $function_name)), 'error');
+ }
+ else {
+ drupal_set_message(t("Error trying to call SOAP function $function_name. Check watchdog logs for more information."), 'error');
+ }
+
+ watchdog(t("FEDORA_REPOSITORY"), t("Error Trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e)), NULL, WATCHDOG_ERROR);
+ }
+ return NULL;
}
break;
default:
try {
- $soap_client = self::$connection_helper->getSoapClient( variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'));
+ $soap_client = self::$connection_helper->getSoapClient(variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'));
if (!empty($soap_client)) {
$result = $soap_client->__soapCall($function_name, array('parameters' => $params_array));
}
@@ -710,19 +715,17 @@ class Fedora_Item {
watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
return NULL;
}
- }
- catch (exception $e) {
-
- if (!$quiet) {
- watchdog(t("FEDORA_REPOSITORY"), t("Error trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e)), NULL, WATCHDOG_ERROR);
- }
- return NULL;
+ } catch (exception $e) {
+
+ if (!$quiet) {
+ watchdog(t("FEDORA_REPOSITORY"), t("Error trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e)), NULL, WATCHDOG_ERROR);
+ }
+ return NULL;
}
}
return $result;
}
-
/**
* Creates the minimal FOXML for a new Fedora object, which is then passed to
* ingest_from_FOXML to be added to the repository.
@@ -766,7 +769,7 @@ class Fedora_Item {
$owner_property = $foxml->createElement("foxml:property");
$owner_property->setAttribute("NAME", "info:fedora/fedora-system:def/model#ownerId");
- $owner_property->setAttribute("VALUE", $owner );
+ $owner_property->setAttribute("VALUE", $owner);
$object_properties->appendChild($state_property);
$object_properties->appendChild($label_property);
@@ -778,7 +781,7 @@ class Fedora_Item {
}
static function ingest_new_item($pid = '', $state = 'A', $label = '', $owner = '') {
- return self::ingest_from_FOXML(self::create_object_FOXML( $pid, $state, $label, $owner));
+ return self::ingest_from_FOXML(self::create_object_FOXML($pid, $state, $label, $owner));
}
static function fedora_item_exists($pid) {
@@ -786,9 +789,9 @@ class Fedora_Item {
return $item->exists();
}
- /********************************************************
+ /* * ******************************************************
* Relationship Functions
- ********************************************************/
+ * ****************************************************** */
/**
* Returns an associative array of relationships that this item has
diff --git a/api/fedora_utils.inc b/api/fedora_utils.inc
index f286806c..39c9854f 100644
--- a/api/fedora_utils.inc
+++ b/api/fedora_utils.inc
@@ -66,8 +66,40 @@ function do_curl($url, $return_to_variable = 1, $number_of_post_vars = 0, $post
}
function fedora_available() {
+<<<<<<< HEAD
$response = drupal_http_request(variable_get('fedora_base_url', 'http://localhost:8080/fedora').'/describe');
return ($response->code == 200);
+=======
+
+ $ret = do_curl(variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/management?wsdl'), 1);
+ // A bit of a hack but the SOAP parser will cause a fatal error if you give it the wrong URL.
+ //return (strpos($ret, 'wsdl:definitions') != FALSE);
+
+ module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
+ return true;
+
+
+ try {
+ $connection_helper = new ConnectionHelper();
+
+ $soap_client = $connection_helper->getSoapClient( variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'));
+ if (!empty($soap_client)) {
+
+ $result = $soap_client->__soapCall('describeRepository', array());
+ }
+
+ return TRUE;
+ }
+ catch (SoapFault $e) {
+
+ watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
+
+ return FALSE;
+
+
+ }
+
+>>>>>>> ISLANDORA-125
}
/**
diff --git a/fedora_repository.module b/fedora_repository.module
index 8db073eb..5207f6a1 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -58,9 +58,9 @@ function fedora_repository_purge_object($pid = NULL, $name = NULL) {
return '';
}
$output = t('Are you sure you wish to purge object %name %pid!
This cannot be undone
',
- array(
- '%name' => $name,
- '%pid' => $pid)
+ array(
+ '%name' => $name,
+ '%pid' => $pid)
);
$output .= drupal_get_form('fedora_repository_purge_object_form', $pid);
@@ -101,11 +101,11 @@ function fedora_repository_ingest_object($collection_pid=NULL, $collection_label
if (!validPid($collection_pid)) {
if (validPid(urldecode($collection_pid))) {
$collection_pid = urldecode($collection_pid);
- } else {
+ }
+ else {
drupal_set_message(t("This collection PID $collection_pid is not valid"), 'error');
return ' ';
}
-
}
if ($collection_pid == NULL) {
@@ -145,7 +145,7 @@ function fedora_repository_ingest_form_submit($form, &$form_state) {
$form_state['values']['content_model_pid'] = $contentModelPid;
$form_state['values']['relationship'] = $relationship;
- $err = (!$cm->execFormHandler($form_state['values'],$form_state));
+ $err = (!$cm->execFormHandler($form_state['values'], $form_state));
$_SESSION['fedora_ingest_files'] = ''; //empty this variable
@@ -203,10 +203,11 @@ function fedora_repository_ingest_form_validate($form, &$form_state) {
if (!empty($file)) {
if (!in_array($dformat, $allowedMimeTypes)) {
form_set_error('ingest-file-location', t('The uploaded file\'s mimetype (' . $dformat . ') is not associated with this Content Model. The allowed types are ' .
- implode(' ', $allowedMimeTypes)));
+ implode(' ', $allowedMimeTypes)));
file_delete($file);
return;
- } elseif (!$cm->execIngestRules($file, $dformat)) {
+ }
+ elseif (!$cm->execIngestRules($file, $dformat)) {
drupal_set_message(t('Error following Content Model Rules'), 'error');
foreach (ContentModel::$errors as $err) {
drupal_set_message($err, 'error');
@@ -243,32 +244,32 @@ function fedora_repository_purge_object_form(&$form_state, $pid, $referrer = NUL
return NULL;
}
$form['pid'] = array(
- '#type' => 'hidden',
- '#value' => "$pid"
+ '#type' => 'hidden',
+ '#value' => "$pid"
);
- if (!strstr( drupal_get_destination(), urlencode('fedora/repository'))) {
+ if (!strstr(drupal_get_destination(), urlencode('fedora/repository'))) {
$form['referrer'] = array(
- '#type' => 'hidden',
- '#value' => $referrer,
+ '#type' => 'hidden',
+ '#value' => $referrer,
);
}
- if(!isset($form_state['storage']['confirm'])) {
+ if (!isset($form_state['storage']['confirm'])) {
// do your normal $form definition here
$form['submit'] = array(
- '#type' => 'image_button',
- '#src' => drupal_get_path('module', 'fedora_repository').'/images/purge_big.png',
- '#value' => t('Purge'),
- '#suffix' => 'Purge this object',
+ '#type' => 'image_button',
+ '#src' => drupal_get_path('module', 'fedora_repository') . '/images/purge_big.png',
+ '#value' => t('Purge'),
+ '#suffix' => 'Purge this object',
);
if (!empty($collectionPid)) {
$collectionPid = $_SESSION['fedora_collection'];
}
//$form['#redirect'] = $referrer;
-
+
return $form;
- }
+ }
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
@@ -370,9 +371,9 @@ function add_stream_form_validate($form, &$form_state) {
return FALSE;
}
$validators = array(
- // 'file_validate_is_image' => array(),
- // 'file_validate_image_resolution' => array('85x85'),
- // 'file_validate_size' => array(30 * 1024),
+ // 'file_validate_is_image' => array(),
+ // 'file_validate_image_resolution' => array('85x85'),
+ // 'file_validate_size' => array(30 * 1024),
);
$fileObject = file_save_upload('add-stream-file-location', $validators);
@@ -397,8 +398,8 @@ function fedora_repository_purge_stream($pid = NULL, $dsId = NULL, $name = NULL)
}
$output = t('Are you sure you wish to purge this datastream %name
',
- array(
- '%name' => $name)
+ array(
+ '%name' => $name)
);
$output .= drupal_get_form('fedora_repository_purge_stream_form', $pid, $dsId);
return $output;
@@ -410,13 +411,13 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
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['rebuild'] = TRUE; // along with this
- }
+ }
else {
// this is where you do your processing after they have pressed the confirm button
$params = array(
- "pid" => $pid,
- "logMessage" => "Purged",
- "force" => ""
+ "pid" => $pid,
+ "logMessage" => "Purged",
+ "force" => ""
);
try {
$soapHelper = new ConnectionHelper();
@@ -426,7 +427,8 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
} catch (exception $e) {
if (preg_match('/org\.fcrepo\.server\.security\.xacml\.pep\.AuthzDeniedException/', $e->getMessage())) {
drupal_set_message(t('Error: Insufficient permissions to purge object.'), 'error');
- } else {
+ }
+ else {
drupal_set_message(t($e->getMessage()), 'error');
}
return;
@@ -444,16 +446,16 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
function fedora_repository_purge_stream_form(&$form_state, $pid, $dsId) {
$form['pid'] = array(
- '#type' => 'hidden',
- '#value' => "$pid"
+ '#type' => 'hidden',
+ '#value' => "$pid"
);
$form['dsid'] = array(
- '#type' => 'hidden',
- '#value' => "$dsId"
+ '#type' => 'hidden',
+ '#value' => "$dsId"
);
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Purge')
+ '#type' => 'submit',
+ '#value' => t('Purge')
);
return $form;
@@ -542,11 +544,13 @@ function fedora_repository_replace_stream_form_submit($form, &$form_state) {
*/
$mimetype = new MimeClass();
$dformat = $mimetype->getType($file->filepath);
+
$item = new Fedora_Item($pid);
$item->modify_datastream_by_reference($streamUrl, $dsid, $dsLabel, $dformat);
$form_state['redirect'] = 'fedora/repository/' . $pid;
+
}
function fedora_repository_edit_qdc_page($pid = NULL, $dsId = NULL) {
@@ -649,13 +653,13 @@ function fedora_repository_edit_qdc_form_submit($form, &$form_state) {
function fedora_repository_perm() {
module_load_include('inc', 'fedora_repository', 'ObjectHelper');
return array(
- OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA,
- OBJECTHELPER::$EDIT_FEDORA_METADATA,
- OBJECTHELPER::$PURGE_FEDORA_OBJECTSANDSTREAMS,
- OBJECTHELPER::$ADD_FEDORA_STREAMS,
- OBJECTHELPER::$INGEST_FEDORA_OBJECTS,
- OBJECTHELPER::$EDIT_TAGS_DATASTREAM,
- OBJECTHELPER::$VIEW_DETAILED_CONTENT_LIST,
+ OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA,
+ OBJECTHELPER::$EDIT_FEDORA_METADATA,
+ OBJECTHELPER::$PURGE_FEDORA_OBJECTSANDSTREAMS,
+ OBJECTHELPER::$ADD_FEDORA_STREAMS,
+ OBJECTHELPER::$INGEST_FEDORA_OBJECTS,
+ OBJECTHELPER::$EDIT_TAGS_DATASTREAM,
+ OBJECTHELPER::$VIEW_DETAILED_CONTENT_LIST,
);
}
@@ -717,22 +721,30 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
global $user;
+
if (!fedora_available()) {
drupal_set_message('The Fedora repository server is currently unavailable. Please contact the site administrator.', 'warning', FALSE);
return '';
}
if ($pid &!validPid($pid)) {
+
drupal_set_message(t("Invalid PID!"), 'error');
return ' ';
}
- if ($dsId &!validDsid($dsId)) {
+ if ($dsId & !validDsid($dsId)) {
drupal_set_message(t("Invalid dsID!"), 'error');
return ' ';
}
if (!fedora_repository_access(OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
- drupal_set_message(t("You do not have access to Fedora objects within the attempted namespace or access to Fedora denied!"), 'error');
+ //drupal_set_message(t("You do not have access to Fedora objects within the attempted namespace or access to Fedora denied"), 'error');
+
+ if (user_access('access administration pages')) {
+ drupal_set_message(t("PIDs may be added to allowed namespaces, or all namespace restrictions removed !here", array('!here' => l('here', 'admin/settings/fedora_repository'))), 'warning');
+ }
+ drupal_access_denied();
+ exit;
return ' ';
}
@@ -806,11 +818,16 @@ function repository_page($pid = NULL, $dsId = NULL, $collection = NULL, $pageNum
}
function repository_service($pid = NULL, $servicePid = NULL, $serviceMethod = NULL) {
- module_load_include('inc','fedora_repository', 'api/fedora_item');
- module_load_include('inc','fedora_repository', 'ObjectHelper');
+ module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+ module_load_include('inc', 'fedora_repository', 'ObjectHelper');
global $user;
+
if (!fedora_repository_access(OBJECTHELPER::$OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
- drupal_set_message(t("You do not have access to Fedora objects within the attempted namespace or access to Fedora denied!"), 'error');
+ //drupal_set_message(t("You do not have access to Fedora objects within the attempted namespace or access to Fedora denied"), 'error');
+ drupal_access_denied();
+ if (user_access('access administration pages')) {
+ drupal_set_message(t("PIDs may be added to allowed namespaces, or all namespace restrictions removed !here", array('!here' => l('here', 'admin/settings/fedora_repository'))), 'error');
+ }
return ' ';
}
if ($pid == NULL) {
@@ -823,15 +840,13 @@ function repository_service($pid = NULL, $servicePid = NULL, $serviceMethod = NU
return ' ';
}
-
- $item = new Fedora_Item($pid);
- if ($item !== false)
- {
- echo $item->get_dissemination($servicePid,$serviceMethod);
+
+ $item = new Fedora_Item($pid);
+ if ($item !== false) {
+ echo $item->get_dissemination($servicePid, $serviceMethod);
}
exit();
-
}
//Search Stuff ********************************************************************
@@ -896,7 +911,8 @@ function fedora_repository_search($op = 'search', $keys = NULL) {
$searchQuery = NULL;
if (isset($type) && strcmp($type, ':')) {
$searchQuery = $type . ':' . $keys;
- } else {
+ }
+ else {
$searchQuery = $keys;
}
//$searchQuery.=" AND (PID:vre OR PID:vre:ref OR PID:demo OR PID:changeme)";
@@ -910,10 +926,10 @@ function fedora_repository_search($op = 'search', $keys = NULL) {
$resultData = do_curl($searchUrl);
$results[] = array(
- array(
- 'data' => $resultData,
- 'colspan' => 2
- )
+ array(
+ 'data' => $resultData,
+ 'colspan' => 2
+ )
);
return $results;
}
@@ -926,6 +942,7 @@ function fedora_repository_search($op = 'search', $keys = NULL) {
*/
function fedora_repository_search_page($resultData) {
$path = drupal_get_path('module', 'fedora_repository');
+ $isRestricted = variable_get('fedora_namespace_restriction_enforced', TRUE);
$proc = NULL;
if (!$resultData[0][0]['data']) {
return ''; //no results
@@ -936,10 +953,10 @@ function fedora_repository_search_page($resultData) {
$proc = new XsltProcessor();
} catch (Exception $e) {
$out[] = array(
- array(
- 'data' => $e->getMessage(),
- 'colspan' => 2
- )
+ array(
+ 'data' => $e->getMessage(),
+ 'colspan' => 2
+ )
);
return $out;
}
@@ -951,36 +968,42 @@ function fedora_repository_search_page($resultData) {
$proc->setParameter('', 'allowedPidNameSpaces', variable_get('fedora_pids_allowed', 'default: demo: changeme: Islandora: ilives: '));
$proc->registerPHPFunctions();
$xsl = new DomDocument();
- $xsl->load($path . '/xsl/results.xsl');
- $quimby = $xsl;
+ if ($isRestricted) {
+ $xsl->load($path . '/xsl/results.xsl');
+ }
+ else {
+ $xsl->load($path . '/xsl/unfilteredresults.xsl');
+ }
+
$input = new DomDocument();
$didLoadOk = $input->loadXML(utf8_encode($resultData[0][0]['data']));
if (!$didLoadOk) {
$results[] = array(
- array(
- 'data' => 'Error parsing results',
- 'colspan' => 2
- )
+ array(
+ 'data' => 'Error parsing results',
+ 'colspan' => 2
+ )
);
- } else {
+ }
+ else {
$xsl = $proc->importStylesheet($xsl);
$newdom = $proc->transformToDoc($input);
$results[] = array(
- array(
- 'data' => $newdom->saveHTML(),
- 'colspan' => 2
- )
+ array(
+ 'data' => $newdom->saveHTML(),
+ 'colspan' => 2
+ )
);
}
$header = array(
- array(
- 'data' => t('Collection results'),
- NULL,
- ),
- (NULL)
+ array(
+ 'data' => t('Collection results'),
+ NULL,
+ ),
+ (NULL)
);
$output .= theme('table', $header, $results);
@@ -1008,17 +1031,17 @@ function fedora_repository_form_alter(&$form, &$form_state, $form_id) {
$form['basic']['inline']['keys']['#default_value'] = $default_value;
// Keyword boxes:
$form['advanced'] = array(
- '#type' => 'fieldset',
- '#title' => t('Advanced search'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#attributes' => array(
- 'class' => 'search-advanced'
- ),
+ '#type' => 'fieldset',
+ '#title' => t('Advanced search'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#attributes' => array(
+ 'class' => 'search-advanced'
+ ),
);
$form['advanced']['keywords'] = array(
- '#prefix' => '',
- '#suffix' => '
',
+ '#prefix' => '',
+ '#suffix' => '
',
);
$xmlDoc = new DomDocument();
$xmlDoc->load($path . '/searchTerms.xml');
@@ -1027,15 +1050,15 @@ function fedora_repository_form_alter(&$form, &$form_state, $form_id) {
$types = $searchClass->get_search_terms_array();
$form['advanced']['type'] = array(
- '#type' => 'select',
- '#title' => t('Choose a field to search'),
- '#prefix' => '', '#suffix' => '
', '#options' => $types,
- '#default_value' => $type,
+ '#type' => 'select',
+ '#title' => t('Choose a field to search'),
+ '#prefix' => '', '#suffix' => '
', '#options' => $types,
+ '#default_value' => $type,
);
$form['advanced']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Advanced search'),
- '#prefix' => '', '#suffix' => '
',
+ '#type' => 'submit',
+ '#value' => t('Advanced search'),
+ '#prefix' => '', '#suffix' => '
',
);
$form['#validate'][] = 'fedora_repository_search_validate';
}
@@ -1069,7 +1092,7 @@ function fedora_repository_block($op = 'list', $delta = 0, $edit = array()) {
// This is used to provide a list of possible blocks to the administrator,
// end users will not see these descriptions.
$blocks[0] = array(
- 'info' => t('Repository advanced search block'),
+ 'info' => t('Repository advanced search block'),
);
return $blocks;
case 'configure':
@@ -1083,11 +1106,11 @@ function fedora_repository_block($op = 'list', $delta = 0, $edit = array()) {
// All we need to provide is a text field, Drupal will take care of
// the other block configuration options and the save button.
$form['fedora_repository_advanced_block_repeat'] = array(
- '#type' => 'textfield',
- '#title' => t('Number of times to repeat search fields'),
- '#size' => 5,
- '#description' => t('The number of times you would like the search blocks to be repeated'),
- '#default_value' => variable_get('fedora_repository_advanced_block_repeat', t('3')),
+ '#type' => 'textfield',
+ '#title' => t('Number of times to repeat search fields'),
+ '#size' => 5,
+ '#description' => t('The number of times you would like the search blocks to be repeated'),
+ '#default_value' => variable_get('fedora_repository_advanced_block_repeat', t('3')),
);
break;
}
@@ -1121,16 +1144,16 @@ function fedora_repository_block($op = 'list', $delta = 0, $edit = array()) {
function fedora_repository_theme() {
return array(
- 'fedora_repository_mnpl_advanced_search_form' => array(
- 'arguments' => array(
- 'form' => NULL,
- ),
+ 'fedora_repository_mnpl_advanced_search_form' => array(
+ 'arguments' => array(
+ 'form' => NULL,
),
- 'fedora_repository_time' => array(
- 'arguments' => array(
- 'element' => NULL
- ),
+ ),
+ 'fedora_repository_time' => array(
+ 'arguments' => array(
+ 'element' => NULL
),
+ ),
);
}
@@ -1158,6 +1181,7 @@ function theme_fedora_repository_mnpl_advanced_search_form($form) {
function fedora_repository_mnpl_advanced_search($query, $startPage = 1) {
module_load_include('inc', 'fedora_repository', 'SearchClass');
$searchClass = new SearchClass();
+ $retVal = $searchClass->custom_search($query, $startPage);
return $searchClass->custom_search($query, $startPage);
}
@@ -1191,18 +1215,18 @@ function fedora_repository_demo_objects_form() {
$existing_demos = array();
$form['install_demos'] = array(
- '#title' => t('Islandora Demo Collections'),
- '#type' => 'fieldset',
- '#description' => t('Install demo image and document collections and content models.'),
+ '#title' => t('Islandora Demo Collections'),
+ '#type' => 'fieldset',
+ '#description' => t('Install demo image and document collections and content models.'),
);
$demo_objects = array();
// Check if the top-level islandora collection exists. If not, display a button to ingest.
$form['install_demos']['demo_collections'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Collections to ingest'),
- '#options' => array(),
- '#description' => t('Choose which demo collections you would like ingested into the repository.'),
+ '#type' => 'checkboxes',
+ '#title' => t('Collections to ingest'),
+ '#options' => array(),
+ '#description' => t('Choose which demo collections you would like ingested into the repository.'),
);
foreach (array(
@@ -1221,7 +1245,8 @@ function fedora_repository_demo_objects_form() {
if (empty($demo_objects[$available_demo]->objectProfile)) {
//The demo objects collection does not exist in the repository, display a button to ingest them.
$form['install_demos']['demo_collections']['#options'][$available_demo] = $available_demo_desc;
- } else {
+ }
+ else {
array_push($existing_demos, $demo_objects[$available_demo]);
}
}
@@ -1233,34 +1258,36 @@ function fedora_repository_demo_objects_form() {
$datastreams_list = $smiley_stuff->get_datastreams_list_as_array();
if (empty($datastreams_list['COLLECTION_VIEW'])) {
$form['install_demos']['demo_collections']['#options']['demo:SmileyStuff'] = 'Add Islandora Collection View to Fedora Smiley Stuff Collection';
- } else {
+ }
+ else {
$demo_objects['demo:SmileyStuff'] = $smiley_stuff;
}
- } else {
+ }
+ else {
$form['install_demos']['smileynote'] = array(
- '#value' => 'If you install the '.l('fedora demo objects', 'https://wiki.duraspace.org/display/FCR30/Demonstration+Objects').' Islandora can display them as a collection.
'
+ '#value' => 'If you install the ' . l('fedora demo objects', 'https://wiki.duraspace.org/display/FCR30/Demonstration+Objects') . ' Islandora can display them as a collection.
'
);
}
$form['install_demos']['ingest'] = array(
- '#type' => 'submit',
- '#name' => 'install_demos',
- '#value' => 'Install Selected Demos',
- '#disabled' => (empty($form['install_demos']['demo_collections']['#options'])) ? TRUE : FALSE,
+ '#type' => 'submit',
+ '#name' => 'install_demos',
+ '#value' => 'Install Selected Demos',
+ '#disabled' => (empty($form['install_demos']['demo_collections']['#options'])) ? TRUE : FALSE,
);
$form['existing_demos'] = array(
- '#prefix' => 'Demo collections already installed in this repository:
',
+ '#prefix' => 'Demo collections already installed in this repository:
',
);
-
+
if (!empty($existing_demos)) {
foreach ($existing_demos as $pid => $demo_object) {
-
- $form['existing_demos'][$demo_object->pid] = array (
- '#prefix' => '',
- '#value' => l($demo_object->pid, $demo_object->url()),
- '#suffix' => '',
+
+ $form['existing_demos'][$demo_object->pid] = array(
+ '#prefix' => '',
+ '#value' => l($demo_object->pid, $demo_object->url()),
+ '#suffix' => '',
);
}
}
@@ -1365,7 +1392,7 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
if (!empty($form_state['values']['demo_collections']['islandora:largeimages'])) {
$error = '';
foreach (array('islandora_jp2Sdep-slideCModel.xml', 'islandora_mods2htmlSdef.xml', 'islandora_mods2htmlSdep.xml',
- 'islandora_slideCModel.xml', 'islandora_viewerSdep-slideCModel.xml', 'ilives_jp2Sdef.xml', 'ilives_viewerSdef.xml') as $foxml_file) {
+ 'islandora_slideCModel.xml', 'islandora_viewerSdep-slideCModel.xml', 'ilives_jp2Sdef.xml', 'ilives_viewerSdef.xml') as $foxml_file) {
try {
$item = Fedora_Item::ingest_from_FOXML_file(drupal_get_path('module', 'fedora_repository') . '/content_models/' . $foxml_file);
} catch (exception $e) {
@@ -1393,8 +1420,8 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
function fedora_repository_elements() {
$type['fedora_repository_time'] = array(
- "#input" => TRUE,
- "#process" => array("fedora_repository_expand_time"),
+ "#input" => TRUE,
+ "#process" => array("fedora_repository_expand_time"),
);
return $type;
@@ -1405,8 +1432,8 @@ function fedora_repository_expand_time($element) {
// default value is present it will override value
if (empty($element['#default_value'])) {
$element['#value'] = array(
- 'hour' => intval(format_date(time(), 'custom', 'h')),
- 'minute' => intval(format_date(time(), 'custom', 'i')),
+ 'hour' => intval(format_date(time(), 'custom', 'h')),
+ 'minute' => intval(format_date(time(), 'custom', 'i')),
);
}
@@ -1429,9 +1456,9 @@ function fedora_repository_expand_time($element) {
}
$element[$type] = array(
- '#type' => 'select',
- '#default_value' => $element['#value'][$type],
- '#options' => $options,
+ '#type' => 'select',
+ '#default_value' => $element['#value'][$type],
+ '#options' => $options,
);
}
@@ -1485,7 +1512,8 @@ function fedora_repository_basket_form($form_state, $pids) {
$form['pid'] = array();
$form['title'] = array();
$form['desc'] = array();
- } else {
+ }
+ else {
return;
}
@@ -1499,28 +1527,28 @@ function fedora_repository_basket_form($form_state, $pids) {
}
$form['remove'] = array(
- '#type' => 'checkboxes',
- '#options' => $cbs,
+ '#type' => 'checkboxes',
+ '#options' => $cbs,
);
$form['remove_submit'] = array(
- '#type' => 'submit',
- '#value' => t('Remove selected'),
+ '#type' => 'submit',
+ '#value' => t('Remove selected'),
);
$form['remove_all'] = array(
- '#type' => 'submit',
- '#value' => t('Empty basket'),
+ '#type' => 'submit',
+ '#value' => t('Empty basket'),
);
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Export selected'),
+ '#type' => 'submit',
+ '#value' => t('Export selected'),
);
$form['submit_all'] = array(
- '#type' => 'submit',
- '#value' => t('Export all'),
+ '#type' => 'submit',
+ '#value' => t('Export all'),
);
return $form;
@@ -1528,22 +1556,23 @@ function fedora_repository_basket_form($form_state, $pids) {
function theme_fedora_repository_basket_form($form) {
$header = array(
- theme('table_select_header_cell'),
- t('PID'),
- t('Title'),
- t('Description'),
+ theme('table_select_header_cell'),
+ t('PID'),
+ t('Title'),
+ t('Description'),
);
if (isset($form['pid']) && is_array($form['pid'])) {
foreach (element_children($form['pid']) as $key) {
$rows[] = array(
- drupal_render($form['remove'][$key]),
- drupal_render($form['pid'][$key]),
- drupal_render($form['title'][$key]),
- drupal_render($form['desc'][$key]),
+ drupal_render($form['remove'][$key]),
+ drupal_render($form['pid'][$key]),
+ drupal_render($form['title'][$key]),
+ drupal_render($form['desc'][$key]),
);
}
- } else {
+ }
+ else {
$rows[] = array(array('data' => t('Your basket is empty.'), 'colspan' => '4'));
}
@@ -1581,7 +1610,8 @@ function fedora_repository_basket_form_submit($form, &$form_state) {
if ($form_state['values']['op'] == $form_state['values']['submit_all']) {
$msg = t("All objects exported to staging area");
$pids = _fedora_repository_get_basket_pids();
- } elseif ($form_state['values']['op'] == $form_state['values']['submit']) {
+ }
+ elseif ($form_state['values']['op'] == $form_state['values']['submit']) {
$msg = t("Selected objects exported to staging area");
$pids = array_filter($form_state['values']['remove']);
}
@@ -1616,7 +1646,8 @@ function fedora_repository_basket_form_submit($form, &$form_state) {
drupal_set_message($msg, $success ? 'info' : 'error');
//_fedora_repository_empty_basket();
- } else {
+ }
+ else {
drupal_set_message(t("No objects selected or basket empty"), 'error');
}
@@ -1666,7 +1697,8 @@ function fedora_repository_add_to_basket($pid, $warn = TRUE, $searchResultsFlag
if (!isset($_SESSION['basket'])) {
$_SESSION['basket'] = array();
$_SESSION['basket']['unprocessed'] = array($pid => $pid);
- } else {
+ }
+ else {
$_SESSION['basket']['unprocessed'][$pid] = $pid;
}
@@ -1700,9 +1732,9 @@ function theme_add_to_basket_link($pid, $type = 'object') {
*/
if (!_is_added_to_basket($pid)) {
return l(
- theme('image', drupal_get_path('module', 'Fedora_Repository') . '/images/' . $save, t("Add to basket"), t("Add this @object to my basket", array('@object' => $object))),
- "fedora/repository/addToBasket/" . $path,
- array('html' => TRUE)
+ theme('image', drupal_get_path('module', 'Fedora_Repository') . '/images/' . $save, t("Add to basket"), t("Add this @object to my basket", array('@object' => $object))),
+ "fedora/repository/addToBasket/" . $path,
+ array('html' => TRUE)
);
}
@@ -1718,7 +1750,8 @@ function fedora_repository_display_schema($file) {
$path = drupal_get_path('module', 'fedora_repository');
if (strtolower(substr($file, -3)) == 'xsd' && file_exists($path . '/' . $file)) {
drupal_goto($path . '/' . $file);
- } else {
+ }
+ else {
drupal_goto();
}
return;
diff --git a/formClass.inc b/formClass.inc
index fed6d2aa..1ca22066 100644
--- a/formClass.inc
+++ b/formClass.inc
@@ -4,9 +4,6 @@
/*
* Created on Jan 22, 2008
- *
- * To change the template for this generated file go to
- * Window - Preferences - PHPeclipse - PHP - Code Templates
*/
class formClass {
@@ -24,201 +21,175 @@ class formClass {
$items = array();
$items['admin/settings/fedora_repository'] = array(
- 'title' => t('Fedora collection list'),
- 'description' => t('Enter the Fedora Collection information here'),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('fedora_repository_admin'),
- //'access' => user_access('access administration pages'),
- 'access arguments' => array('administer site configuration'),
- 'type' => MENU_NORMAL_ITEM,
- // 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'title' => t('Fedora collection list'),
+ 'description' => t('Enter the Fedora Collection information here'),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('fedora_repository_admin'),
+ 'access arguments' => array('administer site configuration'),
+ 'type' => MENU_NORMAL_ITEM,
);
$items['admin/settings/fedora_repository/collection'] = array(
- 'title' => t('Collection list'),
- 'description' => t('Enter the Fedora collection information here.'),
- 'access arguments' => array('administer site configuration'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => 0,
+ 'title' => t('Collection list'),
+ 'description' => t('Enter the Fedora collection information here.'),
+ 'access arguments' => array('administer site configuration'),
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'weight' => 0,
);
$items['admin/settings/fedora_repository/demoobjects'] = array(
- 'title' => t('Install demos'),
- 'description' => t('Install example content models and collections to get started using Islandora and Fedora.'),
- 'page callback' => 'fedora_repository_install_demos_page',
- 'access arguments' => array('add fedora datastreams'),
- 'type' => MENU_LOCAL_TASK,
+ 'title' => t('Install demos'),
+ 'description' => t('Install example content models and collections to get started using Islandora and Fedora.'),
+ 'page callback' => 'fedora_repository_install_demos_page',
+ 'access arguments' => array('add fedora datastreams'),
+ 'type' => MENU_LOCAL_TASK,
);
$items['islandoracm.xsd'] = array(
- 'title' => t('Islandoracm XML Schema Definition'),
- 'page callback' => 'fedora_repository_display_schema',
- 'page arguments' => array('islandoracm.xsd'),
- 'type' => MENU_CALLBACK,
- // 'page arguments'=>array(1),
- 'access arguments' => array('view fedora collection'),
- // 'access' => TRUE
- );
-
+ 'title' => t('Islandoracm XML Schema Definition'),
+ 'page callback' => 'fedora_repository_display_schema',
+ 'page arguments' => array('islandoracm.xsd'),
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
+ );
+
$items['collection_policy.xsd'] = array(
- 'title' => t('Islandoracm XML Schema Definition'),
- 'page callback' => 'fedora_repository_display_schema',
- 'page arguments' => array('collection_policy.xsd'),
- 'type' => MENU_CALLBACK,
- // 'page arguments'=>array(1),
- 'access arguments' => array('view fedora collection'),
- // 'access' => TRUE
- );
-
+ 'title' => t('Islandoracm XML Schema Definition'),
+ 'page callback' => 'fedora_repository_display_schema',
+ 'page arguments' => array('collection_policy.xsd'),
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
+ );
+
$items['fedora'] = array(
- // 'title' => t('Digital repository'),
- 'page callback' => 'repository_page',
- 'type' => MENU_CALLBACK,
- // 'page arguments'=>array(1),
- 'access arguments' => array('view fedora collection'),
- // 'access' => TRUE
- );
- $repository_title = variable_get('fedora_repository_title','Digital repository');
- if (trim($repository_title)!= '') {
- $respository_title=t($repository_title);
- } else {
- $repository_title= NULL;
+ 'page callback' => 'repository_page',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
+ );
+ $repository_title = variable_get('fedora_repository_title', 'Digital repository');
+ if (trim($repository_title) != '') {
+ $respository_title = t($repository_title);
+ }
+ else {
+ $repository_title = NULL;
}
$items['fedora/repository'] = array(
- 'title' => $repository_title,
- 'page callback' => 'repository_page',
- 'type' => MENU_NORMAL_ITEM,
- // 'page arguments'=>array(1),
- 'access arguments' => array('view fedora collection'),
- // 'access' => TRUE
+ 'title' => $repository_title,
+ 'page callback' => 'repository_page',
+ 'type' => MENU_NORMAL_ITEM,
+ 'access arguments' => array('view fedora collection'),
+ // 'access' => TRUE
);
$items['fedora/repository/service'] = array(
- 'page callback' => 'repository_service',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection'),
+ 'page callback' => 'repository_service',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
);
$items['fedora/repository/object_download'] = array(
- 'title' => t('Download object'),
- 'page callback' => 'fedora_object_as_attachment',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection')
+ 'title' => t('Download object'),
+ 'page callback' => 'fedora_object_as_attachment',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection')
);
$items['fedora/repository/editmetadata'] = array(
- 'title' => t('Edit metadata'),
- 'page callback' => 'fedora_repository_edit_qdc_page',
- // 'page arguments' => array(1),
- //'type' => MENU_LOCAL_TASK,
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('edit fedora meta data')
+ 'title' => t('Edit metadata'),
+ 'page callback' => 'fedora_repository_edit_qdc_page',
+ // 'page arguments' => array(1),
+ //'type' => MENU_LOCAL_TASK,
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('edit fedora meta data')
);
$items['fedora/repository/purgeStream'] = array(
- 'title' => t('Purge data stream'),
- 'page callback' => 'fedora_repository_purge_stream',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('purge objects and datastreams')
+ 'title' => t('Purge data stream'),
+ 'page callback' => 'fedora_repository_purge_stream',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('purge objects and datastreams')
);
$items['fedora/repository/replaceStream'] = array(
- 'title' => t('Replace Stream'),
- 'page callback' => 'fedora_repository_replace_stream',
+ 'title' => t('Replace Stream'),
+ 'page callback' => 'fedora_repository_replace_stream',
// 'callback arguments' => array(3, 4),
- 'type' => MENU_CALLBACK,
+ 'type' => MENU_CALLBACK,
// 'access callback' => 'fedora_repository_user_access',
- 'access arguments' => array('add fedora datastreams'),
+ 'access arguments' => array('add fedora datastreams'),
);
$items['fedora/repository/purgeObject'] = array(
- 'title' => t('Purge object'),
- 'page callback' => 'fedora_repository_purge_object',
- // 'type' => MENU_LOCAL_TASK,
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('purge objects and datastreams')
+ 'title' => t('Purge object'),
+ 'page callback' => 'fedora_repository_purge_object',
+ // 'type' => MENU_LOCAL_TASK,
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('purge objects and datastreams')
);
$items['fedora/repository/addStream'] = array(
- 'title' => t('Add stream'),
- 'page callback' => 'add_stream',
- // 'type' => MENU_LOCAL_TASK,
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('add fedora datastreams')
+ 'title' => t('Add stream'),
+ 'page callback' => 'add_stream',
+ // 'type' => MENU_LOCAL_TASK,
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('add fedora datastreams')
);
$items['fedora/repository/collection'] = array(
- 'title' => t('Collection view'),
- 'page callback' => 'fedora_collection_view',
- 'type' => MENU_CALLBACK,
- 'access argruments' => array('view fedora collection')
+ 'title' => t('Collection view'),
+ 'page callback' => 'fedora_collection_view',
+ 'type' => MENU_CALLBACK,
+ 'access argruments' => array('view fedora collection')
);
//new for mnpl******************************************
$items['fedora/repository/mnpl_advanced_search'] = array(
- 'title' => t('Repository advanced search'),
- 'page callback' => 'fedora_repository_mnpl_advanced_search',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection')
+ 'title' => t('Repository advanced search'),
+ 'page callback' => 'fedora_repository_mnpl_advanced_search',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection')
);
$items['fedora/ingestObject'] = array(
- 'title' => t('Ingest object'),
- 'page callback' => 'fedora_repository_ingest_object',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('add fedora datastreams')
+ 'title' => t('Ingest object'),
+ 'page callback' => 'fedora_repository_ingest_object',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('add fedora datastreams')
);
$items['fedora/repository/list_terms'] = array(
- 'title' => t('List terms'),
- 'page callback' => 'fedora_repository_list_terms',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection')
+ 'title' => t('List terms'),
+ 'page callback' => 'fedora_repository_list_terms',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection')
);
$items['fedora/tagging/add_tag/js'] = array(
- 'page callback' => 'fedora_tagging_add_tag_js',
- 'access arguments' => array('edit tags datastream'),
- 'type' => MENU_CALLBACK,
+ 'page callback' => 'fedora_tagging_add_tag_js',
+ 'access arguments' => array('edit tags datastream'),
+ 'type' => MENU_CALLBACK,
);
/* Export functionality */
$items['fedora/basket'] = array(
- 'title' => t('Fedora Basket'),
- 'description' => t('View and download objects added to your basket'),
- 'page callback' => 'fedora_repository_basket',
- 'access arguments' => array('view fedora collection'),
- 'type' => MENU_CALLBACK,
+ 'title' => t('Fedora Basket'),
+ 'description' => t('View and download objects added to your basket'),
+ 'page callback' => 'fedora_repository_basket',
+ 'access arguments' => array('view fedora collection'),
+ 'type' => MENU_CALLBACK,
);
$items['fedora/repository/addToBasket'] = array(
- 'page callback' => 'fedora_repository_add_to_basket',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection'),
+ 'page callback' => 'fedora_repository_add_to_basket',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
);
$items['fedora/repository/removeFromBasket'] = array(
- 'page callback' => 'fedora_repository_remove_from_basket',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection'),
+ 'page callback' => 'fedora_repository_remove_from_basket',
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view fedora collection'),
);
$items['fedora/repository/add_search_results_to_basket'] = array(
- 'page callback' => 'fedora_repository_add_search_results_to_basket',
- 'type' => MENU_CALLBACK,
- 'access arguments' => array('view fedora collection'),
- );
-
- /*
- $items['fedora/item'] = array (
- 'title' => t('Repository Item'),
+ 'page callback' => 'fedora_repository_add_search_results_to_basket',
+ 'type' => MENU_CALLBACK,
'access arguments' => array('view fedora collection'),
- 'page callback' => 'fedora_repository_item',
- 'type' => MENU_NORMAL_ITEM,
- );
-
- $item['feodra/item/view'] = array (
- 'title' => t('View Repository Item'),
- 'access arguments' => array('view fedora collection'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => 0,
- );
- */
+ );
- // $items = array_merge($items,$irItems);
return $items;
}
@@ -228,194 +199,182 @@ class formClass {
return;
}
module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
- module_load_include('inc', 'fedora_repository', 'ObjectHelper');
+ module_load_include('inc', 'fedora_repository', 'ObjectHelper');
$form = array();
$form['fedora_repository_name'] = array(
- '#type' => 'textfield',
- '#title' => t('Default collection name'),
- '#default_value' => variable_get('fedora_repository_name', 'Islandora demos collection'),
- '#description' => t('The Name of the collection to grab the list of items from'),
- '#required' => TRUE,
- '#weight' => -2
+ '#type' => 'textfield',
+ '#title' => t('Default collection name'),
+ '#default_value' => variable_get('fedora_repository_name', 'Islandora demos collection'),
+ '#description' => t('The Name of the collection to grab the list of items from'),
+ '#required' => TRUE,
+ '#weight' => -2
);
$form['fedora_repository_pid'] = array(
- '#type' => 'textfield',
- '#title' => t('Default collection PID'),
- '#default_value' => variable_get('fedora_repository_pid', 'islandora:top'),
- '#description' => t('The PID of the collection object to grab the list of items from'),
- '#required' => TRUE,
- '#weight' => -2
+ '#type' => 'textfield',
+ '#title' => t('Default collection PID'),
+ '#default_value' => variable_get('fedora_repository_pid', 'islandora:top'),
+ '#description' => t('The PID of the collection object to grab the list of items from'),
+ '#required' => TRUE,
+ '#weight' => -2
);
$form['fedora_collection_model_pid'] = array(
- '#type' => 'textfield',
- '#title' => t('Default Collection Model PID'),
- '#default_value' => variable_get('fedora_collection_model_pid', 'islandora:collectionCModel'),
- '#description' => t('The PID of the default Collection Model Object'),
- '#required' => TRUE,
- '#weight' => -2
+ '#type' => 'textfield',
+ '#title' => t('Default Collection Model PID'),
+ '#default_value' => variable_get('fedora_collection_model_pid', 'islandora:collectionCModel'),
+ '#description' => t('The PID of the default Collection Model Object'),
+ '#required' => TRUE,
+ '#weight' => -2
);
$form['fedora_content_model_collection_pid'] = array(
- '#type' => 'textfield',
- '#title' => t('Default Content Model Collection PID'),
- '#default_value' => variable_get('fedora_content_model_collection_pid', 'islandora:ContentModelCollection'),
- '#description' => t('The PID of the Content Model Collection Object'),
- '#required' => TRUE,
- '#weight' => -2
+ '#type' => 'textfield',
+ '#title' => t('Default Content Model Collection PID'),
+ '#default_value' => variable_get('fedora_content_model_collection_pid', 'islandora:ContentModelCollection'),
+ '#description' => t('The PID of the Content Model Collection Object'),
+ '#required' => TRUE,
+ '#weight' => -2
);
$form['fedora_repository_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora RISearch URL'),
- '#default_value' => variable_get('fedora_repository_url',
- 'http://localhost:8080/fedora/risearch'),
- '#description' => t('The url of the Fedora server'), '#required' => TRUE,
- '#weight' => 0
+ '#type' => 'textfield',
+ '#title' => t('Fedora RISearch URL'),
+ '#default_value' => variable_get('fedora_repository_url',
+ 'http://localhost:8080/fedora/risearch'),
+ '#description' => t('The url of the Fedora server'), '#required' => TRUE,
+ '#weight' => 0
);
$form['fedora_fgsearch_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora Lucene search URL'),
- '#default_value' => variable_get('fedora_fgsearch_url', 'http://localhost:8080/fedoragsearch/rest'),
- '#description' => t('The url of the Lucene Fedora server'),
- '#required' => TRUE,
- '#weight' => 0
+ '#type' => 'textfield',
+ '#title' => t('Fedora Lucene search URL'),
+ '#default_value' => variable_get('fedora_fgsearch_url', 'http://localhost:8080/fedoragsearch/rest'),
+ '#description' => t('The url of the Lucene Fedora server'),
+ '#required' => TRUE,
+ '#weight' => 0
);
$form['fedora_index_name'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora Lucene index name'),
- '#default_value' => variable_get('fedora_index_name', 'BasicIndex'),
- '#description' => t('The name of the Lucene index to search'),
- '#required' => TRUE,
- '#weight' => 0
+ '#type' => 'textfield',
+ '#title' => t('Fedora Lucene index name'),
+ '#default_value' => variable_get('fedora_index_name', 'BasicIndex'),
+ '#description' => t('The name of the Lucene index to search'),
+ '#required' => TRUE,
+ '#weight' => 0
);
$form['fedora_soap_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora SOAP Url'),
- '#default_value' => variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'),
- '#description' => t('The URL to use for SOAP connections'),
- '#required' => TRUE,
- '#weight' => 0,
- // '#suffix' => ''. (fedora_available() ? ' . ')
'. t('Successfully connected to Fedora server at ') : ' . ')
'. t('Unable to connect to Fedora server at ')) . variable_get('fedora_soap_url', '') . '
',
- '#suffix' => '' . (fedora_available() ? ' . ')
' . t('Successfully connected to Fedora server at !fedora_soap_url', array('!fedora_soap_url' => variable_get('fedora_soap_url', ''))) : ' . ')
' . t('Unable to connect to Fedora server at !fedora_soap_url
', array('!fedora_soap_url' => variable_get('fedora_soap_url', '')))),
+ '#type' => 'textfield',
+ '#title' => t('Fedora SOAP Url'),
+ '#default_value' => variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'),
+ '#description' => t('The URL to use for SOAP connections'),
+ '#required' => TRUE,
+ '#weight' => 0,
+ '#suffix' => '' . (fedora_available() ? '' . t('Successfully connected to Fedora server at !fedora_soap_url', array('!fedora_soap_url' => variable_get('fedora_soap_url', ''))) : ' ' . t('Unable to connect to Fedora server at !fedora_soap_url
', array('!fedora_soap_url' => variable_get('fedora_soap_url', '')))),
);
$form['fedora_base_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora base URL'),
- '#default_value' => variable_get('fedora_base_url', 'http://localhost:8080/fedora'),
- '#description' => t('The URL to use for REST-type connections'),
- '#required' => TRUE,
- '#weight' => 0,
+ '#type' => 'textfield',
+ '#title' => t('Fedora base URL'),
+ '#default_value' => variable_get('fedora_base_url', 'http://localhost:8080/fedora'),
+ '#description' => t('The URL to use for REST-type connections'),
+ '#required' => TRUE,
+ '#weight' => 0,
);
$form['fedora_soap_manage_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora SOAP management URL'),
- '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'), '#description' => t('The URL to use for SOAP API-M connections'),
- '#required' => TRUE,
- '#weight' => 0
+ '#type' => 'textfield',
+ '#title' => t('Fedora SOAP management URL'),
+ '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'), '#description' => t('The URL to use for SOAP API-M connections'),
+ '#required' => TRUE,
+ '#weight' => 0
);
$form['fedora_solr_search_url'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora Solr search URL'),
- '#default_value' => variable_get('fedora_solr_search_url', 'http://localhost:8080/solr'), '#description' => t('The URL to use for Solr searching'),
- '#required' => TRUE,
- '#weight' => 0
- );
-
- /*
- $form['fedora_default_display_pid'] = array(
'#type' => 'textfield',
- '#title' => t('Fedora Default Display Object Pid' ),
- '#default_value' => variable_get('fedora_default_display_pid', 'demo:10'),
- '#description' => t('Object Pid of an Image to show if the requested pid/datastream cannot be found'),
+ '#title' => t('Fedora Solr search URL'),
+ '#default_value' => variable_get('fedora_solr_search_url', 'http://localhost:8080/solr'), '#description' => t('The URL to use for Solr searching'),
'#required' => TRUE,
'#weight' => 0
+ );
+
+// will allow admin user to remove namepsace restrictions if not explicitly disallowed in settings.php
+ if (variable_get('allow_open_namespace', TRUE)) {
+ $form['fedora_namespace'] = array(
+ '#type' => 'fieldset',
);
- $form['fedora_default_display_dsid'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora Default Display Datastream ID' ),
- '#default_value' => variable_get('fedora_default_display_dsid', 'TN'),
- '#description' => t('Object Datastream id of an Image to show if the requested pid/datastream cannot be found'),
- '#required' => TRUE,
- '#weight' => 0
+
+ $form['fedora_namespace']['fedora_namespace_restriction_enforced'] = array(
+ '#weight' => -1,
+ '#type' => 'radios',
+ '#title' => t('Enforce namespace restrictions'),
+ '#options' => array(
+ TRUE => t('Enabled'),
+ FALSE => t('Disabled')
+ ),
+ '#description' => t('Allow administrator to restrict user\'s access to the PID namepaces listed below'),
+ '#default_value' => variable_get('fedora_namespace_restriction_enforced', TRUE)
);
- */
- $form['fedora_pids_allowed'] = array(
+ $form['fedora_namespace']['fedora_pids_allowed'] = array(
'#type' => 'textfield',
'#title' => t('PID namespaces allowed in this Drupal install'),
- '#default_value' => variable_get('fedora_pids_allowed', 'default: demo: changeme: Islandora: ilives: '),
- '#description' => t('The PID namespaces that you are allowed to see from this Drupal install. In reality this can be more than a namespace as it could include demo:mydemos etc. Can be a space seperated list to include more than one PID namespace.'),
- '#required' => TRUE,
+ '#default_value' => variable_get('fedora_pids_allowed', 'default: demo: changeme: islandora: ilives: '),
+ '#description' => t('A space separated list PID namespaces that users are permitted to access from this Drupal installation.
This could be more than a simple namespace ie demo:mydemos.'),
'#weight' => 0
- );
- /*
- $form['fedora_admin_user'] = array(
- '#type' => 'textfield',
- '#title' => t('A user with the Drupal role administrator'),
- '#default_value' => variable_get('fedora_admin_user', 'admin'),
- '#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.'),
- '#required' => TRUE, '#weight' => 0
);
-
- $form['fedora_searchterms_location'] = array(
- '#type' => 'file',
- '#title' => 'SearchTerms.xml file location',
+ }
+ else {
+ $form['fedora_pids_allowed'] = array(
+ '#type' => 'textfield',
+ '#title' => t('PID namespaces allowed in this Drupal install'),
+ '#default_value' => variable_get('fedora_pids_allowed', 'default: demo: changeme: islandora: ilives: '),
+ '#description' => t('A space separated list PID namespaces that users are permitted to access from this Drupal installation.
This could be more than a simple namespace ie demo:mydemos.'),
+ '#weight' => 0
);
- */
-
+ }
$form['fedora_repository_title'] = array(
- '#type' => 'textfield',
- '#title' => t('Fedora Repository Title'),
- '#default_value'=> variable_get('fedora_repository_title', 'Digital Repository'),
- '#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.'),
+ '#type' => 'textfield',
+ '#title' => t('Fedora Repository Title'),
+ '#default_value' => variable_get('fedora_repository_title', 'Digital Repository'),
+ '#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.'),
);
-
$form['fedora_object_display_title'] = array(
- '#type' => 'select',
- '#title' => t('Display Object Title Behaviour'),
- '#default_value'=> variable_get('fedora_object_display_title', ObjectHelper::$DISPLAY_ALWAYS),
- '#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.'),
+ '#type' => 'select',
+ '#title' => t('Display Object Title Behaviour'),
+ '#default_value' => variable_get('fedora_object_display_title', ObjectHelper::$DISPLAY_ALWAYS),
+ '#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.'),
);
-
-
$form['fedora_object_display_description'] = array(
'#type' => 'select',
'#title' => t('Display Object Description Behaviour'),
- '#default_value'=> variable_get('fedora_object_display_description', ObjectHelper::$DISPLAY_ALWAYS),
- '#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.')),
+ '#default_value' => variable_get('fedora_object_display_description', ObjectHelper::$DISPLAY_ALWAYS),
+ '#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.'),
);
-
+
$form['fedora_object_restrict_datastreams'] = array(
'#type' => 'checkbox',
'#title' => t('Restrict Access to Fedora Object Datastreams'),
- '#default_value'=> variable_get('fedora_object_restrict_datastreams', FALSE),
+ '#default_value' => variable_get('fedora_object_restrict_datastreams', FALSE),
'#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(
'#type' => 'select',
'#title' => t('Display Collection List Behaviour'),
- '#default_value'=> variable_get('fedora_collection_display_list', ObjectHelper::$DISPLAY_ALWAYS),
- '#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.')),
+ '#default_value' => variable_get('fedora_collection_display_list', ObjectHelper::$DISPLAY_ALWAYS),
+ '#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.'),
);
-
//Export functionality
$form['module']['export_area'] = array(
- '#type' => 'textfield',
- '#title' => t('Export area'),
- '#default_value' => variable_get('export_area', file_directory_path() . '/fedora_export_area'),
- '#description' => t("Path to the export area. It must be accessible by druapl (i.e. apache user)."),
- '#required' => TRUE,
+ '#type' => 'textfield',
+ '#title' => t('Export area'),
+ '#default_value' => variable_get('export_area', file_directory_path() . '/fedora_export_area'),
+ '#description' => t("Path to the export area. It must be accessible by druapl (i.e. apache user)."),
+ '#required' => TRUE,
);
$form['#attributes'] = array('enctype' => "multipart/form-data");
@@ -451,7 +410,7 @@ class formClass {
if (!strcmp(substr($key, 0, 4), 'app_')) {
$key = substr($key, 4);
$previousElement->appendChild($dom->createElement($key, $value));
- }
+ }
else {
$previousElement = $dom->createElement($key, $value);
$oai->appendChild($previousElement);
@@ -472,14 +431,14 @@ class formClass {
$pid = $form_values['pid'];
$dsId = $form_values['dsid'];
$params = array(
- "pid" => $pid,
- "dsID" => $dsId,
- "altIDs" => "",
- "dsLabel" => "Qualified Dublin Core",
- "MIMEType" => "text/xml",
- "formatURI" => "URL",
- "dsContent" => $dom->saveXML(), "checksumType" => "DISABLED", "checksum" => "none",
- "logMessage" => "datastream_modified", "force" => "TRUE");
+ "pid" => $pid,
+ "dsID" => $dsId,
+ "altIDs" => "",
+ "dsLabel" => "Qualified Dublin Core",
+ "MIMEType" => "text/xml",
+ "formatURI" => "URL",
+ "dsContent" => $dom->saveXML(), "checksumType" => "DISABLED", "checksum" => "none",
+ "logMessage" => "datastream_modified", "force" => "TRUE");
try {
$object = $client->__soapCall('ModifyDatastreamByValue', array($params));
} catch (exception $e) {
@@ -544,17 +503,16 @@ class formClass {
switch ($form_state['storage']['step']) {
case 1:
$form['indicator'] = array(
- '#type' => 'fieldset',
- '#title' => t('Ingest digital object into collection_pid !collection_label Step #1', array('collection_pid' => $collection_pid, '!collection_label' => $collection_label))
+ '#type' => 'fieldset',
+ '#title' => t('Ingest digital object into collection_pid !collection_label Step #1', array('collection_pid' => $collection_pid, '!collection_label' => $collection_label))
);
$form['indicator']['models'] = array(// content models available
- '#type' => 'select',
- '#title' => t('Content models available'),
- '#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 define datastream composition, relationships between this and other content models, and the mandatory behaviors associated with each digital object.
Additional information may be found here. ')
-
+ '#type' => 'select',
+ '#title' => t('Content models available'),
+ '#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 define datastream composition, relationships between this and other content models, and the mandatory behaviors associated with each digital object.
Additional information may be found here. ')
);
break;
@@ -578,22 +536,22 @@ class formClass {
}
$form['collection_pid'] = array(
- '#type' => 'hidden',
- '#value' => $collection_pid
+ '#type' => 'hidden',
+ '#value' => $collection_pid
);
if ($form_state['storage']['step'] < 2) {
$button_name = t('Next');
- }
+ }
else {
$prefix = t('Please be patient. Once you click next there may be a number of files created. Depending on your content model this could take a few minutes to process.
');
$button_name = t('Ingest');
}
$form['submit'] = array(
- '#type' => 'submit',
- '#submit' => array('fedora_repository_ingest_form_submit'),
- '#value' => $button_name
+ '#type' => 'submit',
+ '#submit' => array('fedora_repository_ingest_form_submit'),
+ '#value' => $button_name
);
return $form;
@@ -633,13 +591,13 @@ class formClass {
if ($form_state['submitted'] && $form_state['clicked_button']['#value'] != 'OK') {
$form['add_datastream_label'] = array(
- '#value' => t('
The datastream has been uploaded.
'),
- '#weight' => -10,
+ '#value' => t('
The datastream has been uploaded.
'),
+ '#weight' => -10,
);
$form['#redirect'] = "fedora/repository/$pid/";
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('OK')
+ '#type' => 'submit',
+ '#value' => t('OK')
);
return $form;
}
@@ -651,49 +609,34 @@ class formClass {
}
$form['add_datastream_label'] = array(
- '#value' => t('
Add Datastream:
'),
- '#weight' => -10,
+ '#value' => t('
Add Datastream:
'),
+ '#weight' => -10,
);
$form['pid'] = array(
- '#type' => 'hidden',
- '#value' => "$pid"
+ '#type' => 'hidden',
+ '#value' => "$pid"
);
- /*
- $form['stream_location'] = array (
- '#title' => 'File Location',
- '#required' => 'TRUE',
- '#description' => 'The path to the file for the new datastream',
- //'#prefix' => 'Upload File',
- '#type' => 'hidden'
- );
- */
$form['stream_label'] = array(
- '#title' => 'Datastream Label',
- '#required' => 'TRUE',
- '#description' => t('A Human readable label'),
- '#type' => 'textfield'
- );
- // $form['delete_file'] = array (
- // '#title' => 'Remove File After Ingest',
- // '#description' => 'Remove the file from the drupal file system after ingest into the Digital Repository.',
- // '#type' => 'hidden',
- // '#default_value' => 'remove_file',
- // '#options' => $options
- // );
+ '#title' => 'Datastream Label',
+ '#required' => 'TRUE',
+ '#description' => t('A Human readable label'),
+ '#type' => 'textfield'
+ );
+
$form['#attributes']['enctype'] = 'multipart/form-data';
$form['add-stream-file-location'] = array(
- '#type' => 'file',
- '#title' => t('Upload Document'),
- '#size' => 48,
- // '#required'=>'TRUE',
- '#description' => t('The file to upload.')
+ '#type' => 'file',
+ '#title' => t('Upload Document'),
+ '#size' => 48,
+ // '#required'=>'TRUE',
+ '#description' => t('The file to upload.')
);
$form['#redirect'] = "fedora/repository/$pid/";
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Add Datastream')
+ '#type' => 'submit',
+ '#value' => t('Add Datastream')
);
if (!empty($unused_dsids)) {
@@ -702,21 +645,23 @@ class formClass {
$dsidsForForm[$dsid]=$dsid;
}
$form['stream_id'] = array(
- '#type' => 'select',
- '#title' => t('Datastream ID'),
- '#default_value' => variable_get('feed_item_length', 'teaser'),
- '#weight' => '-1',
- '#description' => t('Datastream IDs defined by the content model.'),
+ '#type' => 'select',
+ '#title' => t('Datastream ID'),
+ '#default_value' => variable_get('feed_item_length', 'teaser'),
+ '#weight' => '-1',
+ '#description' => t('Datastream IDs defined by the content model.'),
);
+
$form['stream_id']['#options'] = $dsidsForForm;
}
+
else {
$form['stream_id'] = array(
- '#title' => 'Datastream ID',
- '#required' => 'TRUE',
- '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores.'),
- '#type' => 'textfield',
- '#weight' => -1,
+ '#title' => 'Datastream ID',
+ '#required' => 'TRUE',
+ '#description' => t('An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters and dashes and underscores.'),
+ '#type' => 'textfield',
+ '#weight' => -1,
);
}
return $form;
@@ -753,31 +698,31 @@ class formClass {
$name = $dcItems->item($i)->nodeName;
if ($name == 'dc:description') {
$form["$name" . '-' . "$i"] = array(
- '#title' => $name,
- '#type' => 'textarea',
- '#default_value' => $dcItems->item($i)->nodeValue,
- '#description' => 'Dublin Core ' . substr($dcItems->item($i)->nodeName, 3)
+ '#title' => $name,
+ '#type' => 'textarea',
+ '#default_value' => $dcItems->item($i)->nodeValue,
+ '#description' => 'Dublin Core ' . substr($dcItems->item($i)->nodeName, 3)
);
- }
+ }
elseif ($name == 'dc:title') {
$form["$name" . '-' . "$i"] = array(
- '#title' => $name,
- '#type' => 'textfield',
- '#required' => 'TRUE',
- '#default_value' => $dcItems->item($i)->nodeValue,
- '#description' => 'Dublin Core ' . substr($dcItems->item($i)->nodeName, 3)
+ '#title' => $name,
+ '#type' => 'textfield',
+ '#required' => 'TRUE',
+ '#default_value' => $dcItems->item($i)->nodeValue,
+ '#description' => 'Dublin Core ' . substr($dcItems->item($i)->nodeName, 3)
);
- }
+ }
else {
if ($oai_dc->item(0)->nodeName != $dcItems->item($i)->parentNode->nodeName) {
$description = strstr($name, ':');
$form['app_' . "$name" . '-' . "$i"] = array(
- '#title' => $name,
- '#type' => 'textfield',
- '#default_value' => $dcItems->item($i)->nodeValue,
- '#description' => 'Dublin Core ' . substr($description, 1)
+ '#title' => $name,
+ '#type' => 'textfield',
+ '#default_value' => $dcItems->item($i)->nodeValue,
+ '#description' => 'Dublin Core ' . substr($description, 1)
);
- }
+ }
else {
$field_type = 'textfield';
$value = $dcItems->item($i)->nodeValue;
@@ -789,26 +734,26 @@ class formClass {
}
$description = strstr($name, ':');
$form["$name" . '-' . "$i"] = array(
- '#title' => $name,
- '#type' => $field_type,
- '#default_value' => $value,
- '#description' => 'Dublin Core ' . substr($description, 1)
+ '#title' => $name,
+ '#type' => $field_type,
+ '#default_value' => $value,
+ '#description' => 'Dublin Core ' . substr($description, 1)
);
}
}
}
- // $form['#redirect'] = "fedora/repository/$pid/";
+
$form['pid'] = array(
- '#type' => 'hidden',
- '#value' => "$pid"
+ '#type' => 'hidden',
+ '#value' => "$pid"
);
$form['dsid'] = array(
- '#type' => 'hidden',
- '#value' => "$dsId"
+ '#type' => 'hidden',
+ '#value' => "$dsId"
);
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Update Metadata'),
+ '#type' => 'submit',
+ '#value' => t('Update Metadata'),
);
return $form;
@@ -822,62 +767,33 @@ class formClass {
$form['#attributes']['enctype'] = 'multipart/form-data';
$form['file'] = array(
- '#type' => 'file',
- '#title' => t('Upload Document'),
- '#description' => t('The file to upload.')
+ '#type' => 'file',
+ '#title' => t('Upload Document'),
+ '#description' => t('The file to upload.')
);
$form['pid'] = array(
- '#type' => 'value',
- '#value' => $pid,
+ '#type' => 'value',
+ '#value' => $pid,
);
$form['dsId'] = array(
- '#type' => 'value',
- '#value' => $dsId,
+ '#type' => 'value',
+ '#value' => $dsId,
);
$form['dsLabel'] = array(
- '#type' => 'value',
- '#value' => $dsLabel,
+ '#type' => 'value',
+ '#value' => $dsLabel,
);
$form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Replace Datastream')
+ '#type' => 'submit',
+ '#value' => t('Replace Datastream')
);
return $form;
}
- /*
- function createReplaceDataStreamForm($pid, $dsId, &$form_state) {
- $form = array();
-
- $form['#attributes']['enctype'] = 'multipart/form-data';
- $form['file'] = array(
- '#type' => 'file',
- '#title' => t('Upload Document'),
- '#description' => t('The file to upload.')
- );
-
- $form['pid'] = array(
- '#type' => 'value',
- '#value' => $pid,
- );
-
- $form['dsId'] = array(
- '#type' => 'value',
- '#value' => $dsId,
- );
-
- $form['submit']=array(
- '#type' => 'submit',
- '#value'=>t('Replace Datastream')
- );
-
- return $form;
- }
- */
}
diff --git a/ilives/fedora_ilives.module b/ilives/fedora_ilives.module
index 46022943..55a9953d 100644
--- a/ilives/fedora_ilives.module
+++ b/ilives/fedora_ilives.module
@@ -548,6 +548,7 @@ function install_book_content_model_objects() {
module_load_include('inc', 'fedora_repository', 'api/fedora_item');
$allowed_pids_str = variable_get('fedora_pids_allowed', 'default: demo: changeme: Islandora: ilives: ');
$allowed_pids = explode(' ', $allowed_pids_str);
+
if (!in_array('ilives:', $allowed_pids)) {
variable_set('fedora_pids_allowed', $allowed_pids_str . ' ilives:');
diff --git a/plugins/fedora_attach/fedora_attach.admin.inc b/plugins/fedora_attach/fedora_attach.admin.inc
index 655dee51..30c378af 100644
--- a/plugins/fedora_attach/fedora_attach.admin.inc
+++ b/plugins/fedora_attach/fedora_attach.admin.inc
@@ -14,10 +14,12 @@
* @see system_settings_form().
*/
function fedora_attach_admin() {
- $options = drupal_map_assoc(explode(" ", variable_get('fedora_pids_allowed', 'default: demo: changeme: Islandora: ilives: ')));
+ $options = drupal_map_assoc(explode(" ", variable_get('fedora_pids_allowed', 'default: demo: changeme: islandora: ilives: ')));
$default_value = variable_get('fedora_attach_pid_namespace', 'default:');
+ $isRestricted = variable_get('fedora_namespace_restriction_enforced',TRUE);
- if (!in_array($default_value, $options)) {
+
+ if (!in_array($default_value, $options) && $isRestricted) {
drupal_set_message( "The value last set here ($default_value) is not in the list of available PID namespaces (perhaps it has changed?). Please choose a valid option from the list.", 'warning' );
}
diff --git a/tests/fedora_repository.test b/tests/fedora_repository.test
index f7801e14..913683c4 100644
--- a/tests/fedora_repository.test
+++ b/tests/fedora_repository.test
@@ -1,39 +1,15 @@
'Fedora Repository',
- 'description' => t('The Fedora repository content models.'),
- 'group' => t('fedora repository'),
- );
- }
-
- function setUp() {
- parent::setUp('fedora_repository', 'tabs');
-
- module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-
- // Create and login user.
- $repository_user = $this->drupalCreateFedoraUser(array('add fedora datastreams',
- 'edit fedora meta data',
- 'edit tags datastream',
- 'ingest new fedora objects',
- 'purge objects and datastreams',
- 'view fedora collection',
- 'view detailed list of content'));
- $this->drupalLogin($repository_user);
-
- }
-
public function testDatastreams() {
module_load_include('inc', 'fedora_repository', 'api/fedora_item');
$pid_list = array();
@@ -195,4 +171,179 @@ class FedoraRepositoryTestCase extends DrupalWebTestCase {
$account->pass_raw = $edit['pass'];
return $account;
}
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Fedora Repository',
+ 'description' => t('The Fedora repository content models.'),
+ 'group' => t('fedora repository'),
+ );
+ }
+
+ function setUp() {
+ parent::setUp('fedora_repository');
+
+ module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+
+ // Create and login user.
+ $repository_user = $this->drupalCreateFedoraUser(array('add fedora datastreams',
+ 'edit fedora meta data',
+ 'edit tags datastream',
+ 'ingest new fedora objects',
+ 'purge objects and datastreams',
+ 'view fedora collection'));
+
+ $this->repository_user = $repository_user;
+ $this->drupalLogin($repository_user);
+ }
+
+ /**
+ * Add an item based on a content model. Initially we will assume that the repository
+ * will be populated with the default content models and collections that are
+ * created from the admin settings -> Install Demos page.
+ *
+ */
+ public function testIngest() {
+ // Check that the 'Strict PDF' content model exists in the repository.
+ //$pdf_cm = new Fedora_Item('islandora:strict_pdf');
+
+ $pid_list = array();
+ // Create a collection for ingesting PDF content model objects.
+ //$this->drupalGet('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection');
+ $ingest_form = array();
+ $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
+
+ $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
+
+ // Add a sample PDF object via the web ingest form.
+ // Required fields are file location, dc:title and dc:description
+ $ingest_form_step_2 = array();
+ $ingest_form_step_2['dc:title'] = $this->randomName(32);
+ $ingest_form_step_2['dc:description'] = $this->randomName(256);
+
+ $ingest_form_step_2['files[ingest-file-location]'] = realpath(drupal_get_path('module', 'fedora_repository') . '/tests/test_files/lorem_ipsum.pdf');
+ $this->drupalPost(NULL, $ingest_form_step_2, 'Ingest');
+ $this->assertText('mimetype (application/pdf) is not associated with this Content Model', 'PDF mime type not accepted in collection content model.', 'message');
+
+ $this->outputScreenContents('Initial ingest form submit step 2', 'fedora_repository');
+
+ // Now try ingesting a proper collection policy.
+ $ingest_form = array();
+ $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
+
+ $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
+ // Required fields are file location, dc:title and dc:description
+ $ingest_form_step_2 = array();
+ $ingest_form_step_2['dc:title'] = $this->randomName(32);
+ $ingest_form_step_2['dc:description'] = $this->randomName(256);
+ $ingest_form_step_2['files[ingest-file-location]'] = realpath(drupal_get_path('module', 'fedora_repository') . '/collection_policies/PDF-COLLECTION POLICY.xml');
+ $this->drupalPost(NULL, $ingest_form_step_2, 'Ingest');
+ //$this->outputScreenContents('Initial ingest form submit step 2 - PDF collection', 'fedora_repository');
+ $this->assertPattern('/Item .* created successfully./', "Verified item created.");
+
+ $pid = $this->getIngestedPid();
+ $pid_list[] = $pid;
+ $this->pass('Now attempting to ingest a PDF into the new collection.');
+ // Now try ingesting a PDF
+ $ingest_form = array();
+ $ingest_form['models'] = 'islandora:strict_pdf/ISLANDORACM';
+ $this->drupalPost("fedora/ingestObject/$pid/", $ingest_form, 'Next');
+ // Required fields are file location, dc:title and dc:description
+ $ingest_form_step_2 = array();
+ $ingest_form_step_2['dc:title'] = "Lorem Ipsum";
+ $ingest_form_step_2['dc:description'] = $this->randomName(256);
+ $ingest_form_step_2['files[ingest-file-location]'] = realpath(drupal_get_path('module', 'fedora_repository') . '/tests/test_files/lorem_ipsum.pdf');
+ $this->drupalPost(NULL, $ingest_form_step_2, 'Ingest');
+ $pid = $this->getIngestedPid();
+ $pid_list[] = $pid;
+ if (!empty($pid)) {
+ $this->pass("Successfully ingested PDF object $pid.");
+ }
+ $this->cleanUpRepository($pid_list);
+ }
+
+ public function testPidSpaceRestriction() {
+
+ // give user full permissions
+
+ $admin_tester = $this->drupalCreateUser(array('administer site configuration', 'view fedora collection'));
+ $this->drupalLogin($admin_tester);
+ $pageContent = $this->drupalGet('admin/settings/fedora_repository');
+ $hasOption = preg_match('/Enforce namespace restrictions/', $pageContent);
+
+
+ if (!$hasOption) {
+ $this->pass('Removal of namespace restrictions is disabled');
+ }
+ else {
+ $this->pass('Removal of namespace restrictions is enabled');
+ $inVal['fedora_namespace_restriction_enforced'] = TRUE;
+ $inVal['fedora_pids_allowed'] = 'simpletest:';
+ $this->drupalPost('admin/settings/fedora_repository', $inVal, 'Save configuration');
+ $this->assertPattern('/The configuration options have been saved./', 'The configuration options have been saved.');
+
+ $this->drupalGet('fedora/repository/islandora:largeimages/');
+ $this->assertPattern('/Access denied/', 'No access to Large image Collection Collection');
+ $inVal['fedora_namespace_restriction_enforced'] = 0;
+ $this->drupalPost('admin/settings/fedora_repository', $inVal, 'Save configuration');
+ $this->assertPattern('/The configuration options have been saved./', 'The configuration options have been saved.');
+ $this->drupalLogin($this->repository_user);
+ $this->drupalGet('fedora/repository/islandora:largeimages/');
+ $this->assertPattern('/Large Images Collection/', 'Access to Large Images Collection');
+ }
+ }
+
+ private function cleanUpRepository($pid_list = array()) {
+ $this->pass("This is the PID list to purge: " . implode(", ", $pid_list));
+ foreach ($pid_list as $pid) {
+ $this->drupalPost("fedora/repository/purgeObject/$pid", array(), 'Purge');
+ }
+ }
+
+ private function getIngestedPid() {
+ $subject = $this->drupalGetContent();
+ $pattern = '/">(.*)<\/a> created successfully./';
+ $matches = array();
+ $res = preg_match($pattern, $subject, $matches);
+ return $matches[1];
+ }
+
+ private function outputScreenContents($description, $basename) {
+ // This is a hack to get a directory that won't be cleaned up by SimpleTest.
+ $file_dir = file_directory_path() . '../simpletest_output_pages';
+ if (!is_dir($file_dir)) {
+ mkdir($file_dir, 0777, TRUE);
+ }
+ $output_path = "$file_dir/$basename." . $this->randomName(10) . '.html';
+ $rv = file_put_contents($output_path, $this->drupalGetContent());
+ $this->pass("$description: Contents of result page are " . l('here', $output_path));
+ }
+
+ protected function drupalCreateFedoraUser($permissions = array('access comments', 'access content', 'post comments', 'post comments without approval')) {
+ // Create a role with the given permission set.
+ if (!($rid = $this->drupalCreateRole($permissions))) {
+ return FALSE;
+ }
+
+ // Create a user assigned to that role.
+ $edit = array();
+ $edit['name'] = 'simpletestuser';
+ $edit['mail'] = $edit['name'] . '@example.com';
+ $edit['roles'] = array($rid => $rid);
+ $edit['pass'] = 'simpletestpass';
+ $edit['status'] = 1;
+
+ $account = user_save('', $edit);
+
+ $this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
+ if (empty($account->uid)) {
+ return FALSE;
+ }
+
+ // Add the raw password so that we can log in as this user.
+ $account->pass_raw = $edit['pass'];
+ return $account;
+ }
+
}
+
diff --git a/xsl/unfilteredresults.xsl b/xsl/unfilteredresults.xsl
new file mode 100644
index 00000000..110f5ea5
--- /dev/null
+++ b/xsl/unfilteredresults.xsl
@@ -0,0 +1,269 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total Hits =
+
+ ,
+
+ Number of Hits/page =
+
+
+
+
+
+
+
+
+
+
+
+
+
Your search yielded no results
+
+
+
+ - Check if your spelling is correct.
+
+ - Remove quotes around phrases to match each word individually:
+ "blue smurf" will match less than
+ blue smurf.
+
+ - Consider loosening your query with
+ OR:
+ blue smurf will match less than
+ blue OR smurf.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fedora/repository/
+ /-/
+
+
+
+ ![]()
+
+ fedora/repository/
+ /TN
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
';
+ $purgeImage = '
';
}
} else {
$purgeImage = ' ';
@@ -274,16 +274,16 @@ class ObjectHelper {
// Add an icon to replace a datastream
// @TODO Note: using l(theme_image(..), ...); for these image links (and other links) may remove the need to have clean urls enabled.
- $replaceImage= ' ';
+ $replaceImage = ' ';
if (user_access(ObjectHelper :: $ADD_FEDORA_STREAMS)) {
- $allow=TRUE;
- if (module_exists('fedora_fesl')) {
- $allow= fedora_fesl_check_roles($pid,'write');
+ $allow = TRUE;
+ if (module_exists('fedora_fesl')) {
+ $allow = fedora_fesl_check_roles($pid, 'write');
}
if ($allow) {
- $replaceImage = 'label . '" href="' . $base_url . '/fedora/repository/replaceStream/' . $pid . '/' . $dataStreamValue->ID . '/' . $dataStreamValue->label . '">
';
+ $replaceImage = 'label . '" href="' . $base_url . '/fedora/repository/replaceStream/' . $pid . '/' . $dataStreamValue->ID . '/' . $dataStreamValue->label . '">
';
+ $output .= '
' . t('Purge Object') . '';
- $purgeObject = drupal_get_form('fedora_repository_purge_object_form', $object_pid, check_plain(substr(request_uri(), strlen(base_path()))));
- }
+ $allow = TRUE;
+ if (module_exists('fedora_fesl')) {
+ $allow = fedora_fesl_check_roles($object_pid, 'write');
+ }
+ if ($allow) {
+ //$purgeObject = '
' . t(' Add to this Collection');
- }
- }
- }
- else {
+ $allow = TRUE;
+ if (module_exists('fedora_fesl')) {
+ $allow = fedora_fesl_check_roles($pid, 'write');
+ }
+ if ($allow) {
+ // $ingestObject = ' $collectionName, '!collection_pid' => $collection_pid)) . '" href="' . base_path() .
+ 'fedora/ingestObject/' . $collection_pid . '/' . $collectionName . '">
' . t(' Add to this Collection');
+ }
+ }
+ } else {
$ingestObject = ' ';
}
@@ -746,20 +753,20 @@ class ObjectHelper {
$objectListOut = '';
if (isset($objectList)) {
$object_list_fieldset = array(
- '#title' => t('Items in this collection'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- '#value' => (isset($objectList) ? $objectList : ''), //collection list
+ '#title' => t('Items in this collection'),
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ '#value' => (isset($objectList) ? $objectList : ''), //collection list
);
$objectListOut = theme('fieldset', $object_list_fieldset);
}
} else {
//$collectionName='';
$collection_fieldset = array(
- '#title' => "",
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- '#value' => $datastreams,
+ '#title' => "",
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ '#value' => $datastreams,
);
$objectListOut = ''; //no collection objects to show so don't show field set
}
@@ -800,10 +807,10 @@ class ObjectHelper {
$metaDataText = t('Description');
$body = $this->getQDC($pid);
$fieldset = array(
- '#title' => t("!metaDataText", array('!metaDataText' => $metaDataText)),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#value' => $body
+ '#title' => t("!metaDataText", array('!metaDataText' => $metaDataText)),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#value' => $body
);
$output .= theme('fieldset', $fieldset);
}
@@ -944,10 +951,10 @@ class ObjectHelper {
// Get pid, title and description for children of object $pid
$query_string = 'select $o $title from <#ri> ' .
// $query_string = 'select $o $title $desc from <#ri> '.
- 'where $s