Prevent white screen when tuque is not accessible.

includes/IslandoraTuque.inc

@@ -108,7 +108,8 @@ class IslandoraTuque {
 function islandora_get_tuque_connection() {
   $tuque = &drupal_static(__FUNCTION__);
   if (!$tuque) {
-    if(IslandoraTuque::exists()) {
+    if (IslandoraTuque::exists()) {
+      require_once(__DIR__ . '/IslandoraTuqueWrapper.inc');
       try {
         $tuque = new IslandoraTuque();
       } catch (Exception $e) {
@@ -121,48 +122,3 @@ function islandora_get_tuque_connection() {
   }
   return $tuque;
 }
-
-class IslandoraFedoraRepository extends FedoraRepository {
-  protected $queryClass = 'IslandoraRepositoryQuery';
-  protected $newObjectClass = 'IslandoraNewFedoraObject';
-  protected $objectClass = 'IslandoraFedoraObject';
-}
-
-class IslandoraRepositoryQuery extends RepositoryQuery {}
-
-class IslandoraNewFedoraObject extends NewFedoraObject {
-  protected $newFedoraDatastreamClass = 'IslandoraNewFedoraDatastream';
-  protected $fedoraDatastreamClass = 'IslandoraFedoraDatastream';
-  protected $fedoraRelsExtClass = 'IslandoraFedoraRelsExt';
-}
-
-class IslandoraFedoraObject extends FedoraObject {
-  protected $newFedoraDatastreamClass = 'IslandoraNewFedoraDatastream';
-  protected $fedoraDatastreamClass = 'IslandoraFedoraDatastream';
-  protected $fedoraRelsExtClass = 'IslandoraFedoraRelsExt';
-}
-
-class IslandoraRepositoryConnection extends RepositoryConnection {}
-
-class IslandoraFedoraApi extends FedoraApi {}
-
-class IslandoraSimpleCache extends SimpleCache {}
-
-class IslandoraNewFedoraDatastream extends NewFedoraDatastream {
-  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
-  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
-}
-
-class IslandoraFedoraDatastream extends FedoraDatastream {
-  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
-  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
-}
-
-class IslandoraFedoraDatastreamVersion extends FedoraDatastreamVersion {
-  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
-  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
-}
-
-class IslandoraFedoraRelsExt extends FedoraRelsExt {}
-
-class IslandoraFedoraRelsInt extends FedoraRelsInt {}

includes/IslandoraTuqueWrapper.inc

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ *
+ * Wrapper around the tuque library, allows for autoloading of Islandora Tuque
+ * Objects.
+ *
+ * @todo Overload functions and apply pre/post hooks.
+ */
+
+class IslandoraFedoraRepository extends FedoraRepository {
+  protected $queryClass = 'IslandoraRepositoryQuery';
+  protected $newObjectClass = 'IslandoraNewFedoraObject';
+  protected $objectClass = 'IslandoraFedoraObject';
+}
+
+class IslandoraRepositoryQuery extends RepositoryQuery {}
+
+class IslandoraNewFedoraObject extends NewFedoraObject {
+  protected $newFedoraDatastreamClass = 'IslandoraNewFedoraDatastream';
+  protected $fedoraDatastreamClass = 'IslandoraFedoraDatastream';
+  protected $fedoraRelsExtClass = 'IslandoraFedoraRelsExt';
+}
+
+class IslandoraFedoraObject extends FedoraObject {
+  protected $newFedoraDatastreamClass = 'IslandoraNewFedoraDatastream';
+  protected $fedoraDatastreamClass = 'IslandoraFedoraDatastream';
+  protected $fedoraRelsExtClass = 'IslandoraFedoraRelsExt';
+}
+
+class IslandoraRepositoryConnection extends RepositoryConnection {}
+
+class IslandoraFedoraApi extends FedoraApi {}
+
+class IslandoraSimpleCache extends SimpleCache {}
+
+class IslandoraNewFedoraDatastream extends NewFedoraDatastream {
+  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
+  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
+}
+
+class IslandoraFedoraDatastream extends FedoraDatastream {
+  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
+  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
+}
+
+class IslandoraFedoraDatastreamVersion extends FedoraDatastreamVersion {
+  protected $fedoraRelsIntClass = 'IslandoraFedoraRelsInt';
+  protected $fedoraDatastreamVersionClass = 'IslandoraFedoraDatastreamVersion';
+}
+
+class IslandoraFedoraRelsExt extends FedoraRelsExt {}
+
+class IslandoraFedoraRelsInt extends FedoraRelsInt {}