Code
/
islandora
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Merge f703736343 into 0de2f61a4b

pull/321/merge
Jonathan Green 13 years ago
parent
0de2f61a4b f703736343
commit
833f8cbbd3
2 changed files with 47 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      includes/tuque.inc
  2. 35
      includes/tuque_wrapper.inc

54
includes/tuque.inc
Unescape View File

@ -7,26 +7,11 @@
$islandora_module_path = drupal_get_path('module', 'islandora');
set_include_path(get_include_path() . PATH_SEPARATOR . 'sites/all/libraries/tuque' . PATH_SEPARATOR . "$islandora_module_path/libraries/tuque/");
// Do this until we expose these in a module or library.
@include_once 'sites/all/libraries/tuque/Datastream.php';
@include_once 'sites/all/libraries/tuque/FedoraApi.php';
@include_once 'sites/all/libraries/tuque/FedoraApiSerializer.php';
@include_once 'sites/all/libraries/tuque/Object.php';
@include_once 'sites/all/libraries/tuque/RepositoryConnection.php';
@include_once 'sites/all/libraries/tuque/Cache.php';
@include_once 'sites/all/libraries/tuque/RepositoryException.php';
@include_once 'sites/all/libraries/tuque/Repository.php';
@include_once 'sites/all/libraries/tuque/FedoraRelationships.php';
@include_once "$islandora_module_path/libraries/tuque/Datastream.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraApi.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraApiSerializer.php";
@include_once "$islandora_module_path/libraries/tuque/Object.php";
@include_once "$islandora_module_path/libraries/tuque/RepositoryConnection.php";
@include_once "$islandora_module_path/libraries/tuque/Cache.php";
@include_once "$islandora_module_path/libraries/tuque/RepositoryException.php";
@include_once "$islandora_module_path/libraries/tuque/Repository.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraRelationships.php";
@include_once 'sites/all/libraries/tuque/RepositoryFactory.php';
@include_once "$islandora_module_path/libraries/tuque/RepositoryFactory.php";
class IslandoraTuque {
@ -85,11 +70,7 @@ class IslandoraTuque {
}
if (self::exists()) {
$this->connection = new IslandoraRepositoryConnection($url, $user_string, $pass_string);
$this->connection->reuseConnection = TRUE;
$this->api = new IslandoraFedoraApi($this->connection);
$this->cache = new IslandoraSimpleCache();
$this->repository = new IslandoraFedoraRepository($this->api, $this->cache);
$this->repository = new IslandoraRepositoryDecorator(RepositoryFactory::getRepository('fedora3', new RepositoryConfig($url, $user_string, $pass_string)));
}
}
@ -100,7 +81,7 @@ class IslandoraTuque {
* TRUE if the Connection class exists FALSE otherwise.
*/
public static function exists() {
return class_exists('RepositoryConnection');
return class_exists('RepositoryFactory');
}
/**
@ -113,3 +94,26 @@ class IslandoraTuque {
drupal_set_message(filter_xss($message), 'error', FALSE);
}
}
class IslandoraRepositoryDecorator extends RepositoryDecorator {
public function constructObject($id = NULL, $create_uuid = FALSE) {
return new IslandoraObjectDecorator(parent::constructObject($id, $create_uuid));
}
public function ingestObject(AbstractObject &$object) {
$object = new IslandoraObjectDecorator(parent::ingestObject($object));
return $object;
}
public function getObject($id) {
return new IslandoraObjectDecorator(parent::getObject($id));
}
}
class IslandoraObjectDecorator extends ObjectDecorator {
}
class IslandoraDatastreamDecorator extends DatastreamDecorator {
}

35
includes/tuque_wrapper.inc
Unescape View File

@ -9,27 +9,28 @@
*/
$islandora_module_path = drupal_get_path('module', 'islandora');
// @todo this until we expost these in a module or library
@include_once 'sites/all/libraries/tuque/Datastream.php';
@include_once 'sites/all/libraries/tuque/FedoraApi.php';
@include_once 'sites/all/libraries/tuque/FedoraApiSerializer.php';
@include_once 'sites/all/libraries/tuque/Object.php';
@include_once 'sites/all/libraries/tuque/RepositoryConnection.php';
set_include_path(get_include_path() . PATH_SEPARATOR . 'sites/all/libraries/tuque' . PATH_SEPARATOR . "$islandora_module_path/libraries/tuque/");
// Do this until we expose these in a module or library.
@include_once 'sites/all/libraries/tuque/implementations/fedora3/Datastream.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApi.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/Object.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/RepositoryConnection.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/Repository.php';
@include_once 'sites/all/libraries/tuque/implementations/fedora3/FedoraRelationships.php';
@include_once 'sites/all/libraries/tuque/Cache.php';
@include_once 'sites/all/libraries/tuque/RepositoryException.php';
@include_once 'sites/all/libraries/tuque/Repository.php';
@include_once 'sites/all/libraries/tuque/FedoraRelationships.php';
@include_once "$islandora_module_path/libraries/tuque/Datastream.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraApi.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraApiSerializer.php";
@include_once "$islandora_module_path/libraries/tuque/Object.php";
@include_once "$islandora_module_path/libraries/tuque/RepositoryConnection.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Datastream.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApi.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraApiSerializer.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Object.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/RepositoryConnection.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/Repository.php";
@include_once "$islandora_module_path/libraries/tuque/implementations/fedora3/FedoraRelationships.php";
@include_once "$islandora_module_path/libraries/tuque/Cache.php";
@include_once "$islandora_module_path/libraries/tuque/RepositoryException.php";
@include_once "$islandora_module_path/libraries/tuque/Repository.php";
@include_once "$islandora_module_path/libraries/tuque/FedoraRelationships.php";
/**
* Allow modules to alter an object before a mutable event occurs.

Write Preview
Loading…
Cancel
Save