From 429b70c518910247104bb0f3abaf4167ac07d05f Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Fri, 8 Jun 2012 17:04:13 -0300 Subject: [PATCH 1/4] ISLANDORA-485 AHAH causes file upload Little patch to allow use of upload_element instead of the normal "file" element --- fedora_repository.module | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/fedora_repository.module b/fedora_repository.module index 2dc986f8..45fe0037 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -220,18 +220,26 @@ function fedora_repository_ingest_form_validate($form, &$form_state) { // Get the uploaded file. $validators = array(); - if (!empty($_FILES['files']['name']['ingest-file-location'])) { - $fileObject = file_save_upload('ingest-file-location', $validators); + $ifl = 'ingest-file-location'; + $fileObject = NULL; + //Check if it's already there; this is what upload_element provides. + if (is_a($form_state['values'][$ifl], 'stdClass') && property_exists($form_state['values'][$ifl], '')) { + $fileObject = $form_state['values'][$ifl]; + } + elseif (!empty($_FILES['files']['name'][$ifl])) { + $fileObject = file_save_upload($ifl, $validators); + } + if ($fileObject !== NULL && property_exists($fileObject, 'filepath')) { file_move($fileObject->filepath, 0, 'FILE_EXISTS_RENAME'); - $form_state['values']['ingest-file-location'] = $fileObject->filepath; + $form_state['values'][$ifl] = $fileObject->filepath; } - if (isset($form_state['values']['ingest-file-location']) && file_exists($form_state['values']['ingest-file-location'])) { + if (isset($form_state['values'][$ifl]) && file_exists($form_state['values'][$ifl])) { module_load_include('inc', 'fedora_repository', 'ContentModel'); module_load_include('inc', 'fedora_repository', 'MimeClass'); - $file = $form_state['values']['ingest-file-location']; + $file = $form_state['values'][$ifl]; $contentModelPid = ContentModel::getPidFromIdentifier($form_state['values']['models']); $contentModelDsid = ContentModel::getDSIDFromIdentifier($form_state['values']['models']); @@ -244,11 +252,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 . ') ' . - t('is not associated with this Content Model. The allowed types are') . - ' ' . implode(' ', $allowedMimeTypes)); + form_set_error($ifl, + t('The uploaded file\'s mimetype (@mime) is not associated with this Content Model. The allowed types are: @allowed', array( + '@mime' => $dformat, + '@allowed' => implode(', ', $allowedMimeTypes), + )); file_delete($file); return; } From c1b3890357b6edafbbf7ea1d9627fe9701f64fa2 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Mon, 11 Jun 2012 10:01:28 -0300 Subject: [PATCH 2/4] Fix syntax error. --- fedora_repository.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora_repository.module b/fedora_repository.module index 45fe0037..52aa116e 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -256,7 +256,7 @@ function fedora_repository_ingest_form_validate($form, &$form_state) { t('The uploaded file\'s mimetype (@mime) is not associated with this Content Model. The allowed types are: @allowed', array( '@mime' => $dformat, '@allowed' => implode(', ', $allowedMimeTypes), - )); + ))); file_delete($file); return; } From 5db38dde915f091fbafa1b8eca24ab42d60b2b6c Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Mon, 18 Jun 2012 15:29:22 +0200 Subject: [PATCH 3/4] Use drupal set headers to allow proper page caching, but disable caching... Noticed at first that it wasn't working, and then it made the DB huge... Anyway. --- ObjectHelper.inc | 14 +++++++------- fedora_repository.module | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ObjectHelper.inc b/ObjectHelper.inc index 25dd8c53..c757fae6 100644 --- a/ObjectHelper.inc +++ b/ObjectHelper.inc @@ -186,7 +186,7 @@ class ObjectHelper { //Set what headers we can... if ($mimeType = $info['content_type']) { - header("Content-Type: $mimeType"); + drupal_set_header("Content-Type: $mimeType"); if ($asAttachment) { $suggestedFileName = "$label"; @@ -212,7 +212,7 @@ class ObjectHelper { $suggestedFileName = "$label.$ext"; } - header('Content-Disposition: attachment; filename="' . $suggestedFileName . '"'); + drupal_set_header('Content-Disposition: attachment; filename="' . $suggestedFileName . '"'); } } @@ -227,14 +227,14 @@ class ObjectHelper { unset($query['q']); } - header('HTTP/1.1 307 Moved Temporarily'); - header('Location: ' . url($effective_url, array('query' => $query))); + drupal_set_header('HTTP/1.1 307 Moved Temporarily'); + drupal_set_header('Location: ' . url($effective_url, array('query' => $query))); } elseif ((isset($user) && $user->uid != 0) || $forceSoap || isset($_SERVER['HTTPS'])) { //If not anonymous, soap is force or we're using HTTPS //Have the webserver mediate the transfer (download and restream) if (($contentSize = self::getDatastreamSize($pid, $dsID, TRUE)) > 0) { - header("Content-Length: $contentSize"); + drupal_set_header("Content-Length: $contentSize"); } $opts = array( @@ -253,8 +253,8 @@ class ObjectHelper { } } else { //Try to redirect directly to Fedora. - header('HTTP/1.1 307 Moved Temporarily'); - header('Location: ' . $url); + drupal_set_header('HTTP/1.1 307 Moved Temporarily'); + drupal_set_header('Location: ' . $url); } } else { diff --git a/fedora_repository.module b/fedora_repository.module index 8642de9c..e66c6ce0 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -994,10 +994,10 @@ function fedora_repository_islandora_tabs($content_models, $pid, $page_number) { //can disable showing the object details tab in admin UI if (variable_get('fedora_repository_show_object_details_tab', TRUE)) { $object_details = $obj->showFieldSets(); - $cmodel_tabs = array_merge($cmodels_tabs, $object_details); + $cmodels_tabs = array_merge($cmodels_tabs, $object_details); } - return array_merge($cmodels_tabs, $object_details); + return $cmodels_tabs; } /** @@ -1159,6 +1159,8 @@ function fedora_object_as_attachment($pid, $dsId, $label=NULL, $version=NULL) { drupal_set_message(t("no pid or dsid given to create an object with!")); return ' '; } + //Disable the page cache, so entire datastreams do not get thrown into the page cache. + $GLOBALS['conf']['cache'] = FALSE; $objectHelper = new ObjectHelper(); $objectHelper->makeObject($pid, $dsId, TRUE, $label, FALSE, $version); From 63d505a1f1870b827bb5ea84c87c4679652caf6d Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Mon, 18 Jun 2012 14:06:23 -0300 Subject: [PATCH 4/4] Use the relevant constant. --- fedora_repository.module | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora_repository.module b/fedora_repository.module index 27341204..a4f337e9 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -1170,8 +1170,9 @@ function fedora_object_as_attachment($pid, $dsId, $label=NULL, $version=NULL) { drupal_set_message(t("no pid or dsid given to create an object with!")); return ' '; } + //Disable the page cache, so entire datastreams do not get thrown into the page cache. - $GLOBALS['conf']['cache'] = FALSE; + $GLOBALS['conf']['cache'] = CACHE_DISABLED; $objectHelper = new ObjectHelper(); $objectHelper->makeObject($pid, $dsId, TRUE, $label, FALSE, $version);