From a788cc52a0d9f83deb047e57ac0d79b530612ac0 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Wed, 4 Mar 2015 13:40:01 -0400 Subject: [PATCH 1/5] Allowing more object altering in hooks. --- includes/tuque_wrapper.inc | 6 ++++-- tests/includes/utilities.inc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index d14a86b3..f5044db0 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -276,8 +276,10 @@ class IslandoraFedoraApiM extends FedoraApiM { ); islandora_alter_datastream($object, $datastream, $context); $params = $context['params']; - if (isset($params['lastModifiedDate'])) { - $params['lastModifiedDate'] = (string) $object[$dsid]->createdDate; + // Anything may be altered during the alter_datastream hook invocation so + // we need to update our time to the change we know about. + if (isset($params['lastModifiedDate']) && $params['lastModifiedDate'] < (string) $object->lastModifiedDate) { + $params['lastModifiedDate'] = (string) $object->lastModifiedDate; } if ($context['block']) { throw new Exception('Modify Datastream was blocked.'); diff --git a/tests/includes/utilities.inc b/tests/includes/utilities.inc index 4eef5255..eefae4cc 100644 --- a/tests/includes/utilities.inc +++ b/tests/includes/utilities.inc @@ -315,7 +315,7 @@ class IslandoraTestUtilities extends IslandoraTestUtilityClass { * * @return bool * TRUE if all objects were removed, or FALSE if any of them still remained - * after removal. + * after removal. */ public function deleteUserCreatedObjects($username) { if ($username === $this->configuration['admin_user']) { From f65607bb0c35bd16c557bc0ed36eade4d0397bc7 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Thu, 5 Mar 2015 12:30:34 -0400 Subject: [PATCH 2/5] Not nuking object continuity. --- includes/tuque_wrapper.inc | 99 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index f5044db0..f4667e43 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -233,6 +233,56 @@ class IslandoraFedoraObject extends FedoraObject { throw $e; } } + + /** + * Purge a datastream. + * + * Invokes datastream altered/purged hooks and calls the API-M method. + * + * @see FedoraObject::purgeObject() + */ + public function purgeDatastream($id) { + $this->populateDatastreams(); + + if (!array_key_exists($id, $this->datastreams)) { + return FALSE; + } + $context = array( + 'action' => 'purge', + 'purge' => TRUE, + 'delete' => FALSE, + 'block' => FALSE, + ); + islandora_alter_datastream($this, $this[$id], $context); + try { + $action = $context['block'] ? 'block' : FALSE; + $action = (!$action && $context['delete']) ? 'delete' : $action; + $action = !$action ? 'purge' : $action; + switch ($action) { + case 'block': + throw new Exception('Purge Datastream was blocked.'); + + case 'delete': + $this[$id]->state = 'D'; + return array(); + + default: + $this->repository->api->m->purgeDatastream($this->id, $id); + unset($this->datastreams[$id]); + $this->refresh(); + islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $this->models, $id, $this, $id); + return TRUE; + } + } + catch (Exception $e) { + watchdog('islandora', 'Failed to purge datastream @dsid from @pid
code: @code
message: @msg', array( + '@pid' => $this->id, + '@dsid' => $id, + '@code' => $e->getCode(), + '@msg' => $e->getMessage()), WATCHDOG_ERROR); + throw $e; + } + } } class IslandoraRepositoryConnection extends RepositoryConnection {} @@ -307,55 +357,6 @@ class IslandoraFedoraApiM extends FedoraApiM { return parent::modifyObject($pid, $params); } - /** - * Purge a datastream from from Fedora. - * - * @see FedoraApiM::purgeDatastream - */ - public function purgeDatastream($pid, $dsid, $params = array()) { - $object = islandora_object_load($pid); - $context = array( - 'action' => 'purge', - 'purge' => TRUE, - 'delete' => FALSE, - 'block' => FALSE, - ); - islandora_alter_datastream($object, $object[$dsid], $context); - try { - $action = $context['block'] ? 'block' : FALSE; - $action = (!$action && $context['delete']) ? 'delete' : $action; - $action = !$action ? 'purge' : $action; - switch ($action) { - case 'block': - throw new Exception('Purge Datastream was blocked.'); - - case 'delete': - $object[$dsid]->state = 'D'; - return array(); - - default: - $ret = parent::purgeDatastream($pid, $dsid, $params); - // We need to remove this object from the cache and reload it as - // Tuque may not have an updated copy. That is the datastream could - // still be present within the object even though it's purged out of - // Fedora. - $tuque = islandora_get_tuque_connection(); - $tuque->cache->delete($pid); - $non_cached_object = islandora_object_load($pid); - islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $non_cached_object->models, $dsid, $non_cached_object, $dsid); - return $ret; - } - } - catch (Exception $e) { - watchdog('islandora', 'Failed to purge datastream @dsid from @pid
code: @code
message: @msg', array( - '@pid' => $pid, - '@dsid' => $dsid, - '@code' => $e->getCode(), - '@msg' => $e->getMessage()), WATCHDOG_ERROR); - throw $e; - } - } - /** * Purge an object. * From 8eecf42360a42acc08fff139d688859dc7dcc033 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Thu, 5 Mar 2015 14:05:12 -0400 Subject: [PATCH 3/5] Playing nice with the parents, cause @adam-vessey made me. --- includes/tuque_wrapper.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index f4667e43..dbb60731 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -56,7 +56,7 @@ function islandora_alter_datastream(AbstractObject $object, AbstractDatastream $ } /** - * Constructs a list of hooks from the given paramenters and invokes them. + * Constructs a list of hooks from the given parameters and invokes them. */ function islandora_invoke_object_hooks($hook, array $models) { module_load_include('inc', 'islandora', 'includes/utilities'); @@ -64,7 +64,7 @@ function islandora_invoke_object_hooks($hook, array $models) { } /** - * Constructs a list of hooks from the given paramenters and invokes them. + * Constructs a list of hooks from the given parameters and invokes them. */ function islandora_invoke_datastream_hooks($hook, array $models, $dsid) { module_load_include('inc', 'islandora', 'includes/utilities'); @@ -253,8 +253,8 @@ class IslandoraFedoraObject extends FedoraObject { 'delete' => FALSE, 'block' => FALSE, ); - islandora_alter_datastream($this, $this[$id], $context); try { + islandora_alter_datastream($this, $this[$id], $context); $action = $context['block'] ? 'block' : FALSE; $action = (!$action && $context['delete']) ? 'delete' : $action; $action = !$action ? 'purge' : $action; @@ -267,10 +267,7 @@ class IslandoraFedoraObject extends FedoraObject { return array(); default: - $this->repository->api->m->purgeDatastream($this->id, $id); - unset($this->datastreams[$id]); - $this->refresh(); - islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $this->models, $id, $this, $id); + parent::purgeDatastream($id); return TRUE; } } @@ -337,6 +334,16 @@ class IslandoraFedoraApiM extends FedoraApiM { return parent::modifyDatastream($pid, $dsid, $params); } + /** + * Purge a datastream from from Fedora. + * + * @see FedoraApiM::purgeDatastream + */ + public function purgeDatastream($pid, $dsid, $params = array()) { + $object = islandora_object_load($pid); + islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $object->models, $dsid, $object, $dsid); + } + /** * Update Fedora Object parameters. * From 3e1c51906d69ff203d2ba7a56b93e377b08f84ce Mon Sep 17 00:00:00 2001 From: willtp87 Date: Thu, 5 Mar 2015 14:13:55 -0400 Subject: [PATCH 4/5] Rely on parent for return. --- includes/tuque_wrapper.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index dbb60731..74129627 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -267,8 +267,7 @@ class IslandoraFedoraObject extends FedoraObject { return array(); default: - parent::purgeDatastream($id); - return TRUE; + return parent::purgeDatastream($id); } } catch (Exception $e) { From 0e82e30d0a370c9d10e3fb09255e2e30e806c6d7 Mon Sep 17 00:00:00 2001 From: willtp87 Date: Thu, 5 Mar 2015 14:38:40 -0400 Subject: [PATCH 5/5] miscomunication and mistakes fixin --- includes/tuque_wrapper.inc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index 74129627..ef2a2991 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -267,7 +267,9 @@ class IslandoraFedoraObject extends FedoraObject { return array(); default: - return parent::purgeDatastream($id); + $to_return = parent::purgeDatastream($id); + islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $this->models, $id, $this, $id); + return $to_return; } } catch (Exception $e) { @@ -333,16 +335,6 @@ class IslandoraFedoraApiM extends FedoraApiM { return parent::modifyDatastream($pid, $dsid, $params); } - /** - * Purge a datastream from from Fedora. - * - * @see FedoraApiM::purgeDatastream - */ - public function purgeDatastream($pid, $dsid, $params = array()) { - $object = islandora_object_load($pid); - islandora_invoke_datastream_hooks(ISLANDORA_DATASTREAM_PURGED_HOOK, $object->models, $dsid, $object, $dsid); - } - /** * Update Fedora Object parameters. *