Merge pull request #7 from bwoodhead/6.x

ISLANDORA-260 Bugfix

CollectionPolicy.inc

@@ -1,7 +1,5 @@
 <?php
 
-// $Id$
-
 /**
  * @file 
  * Collection Policy Class
@@ -41,7 +39,7 @@ class CollectionPolicy extends XMLDatastream {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
 
     try {
-      if (self::validPid($pid)) {
+      if (self::valid_pid($pid)) {
         $dsid = CollectionPolicy::getDefaultDSID();
 
         if ($preFetch) {
@@ -49,7 +47,7 @@ class CollectionPolicy extends XMLDatastream {
           $ds = $fedoraItem->get_datastream_dissemination($dsid);
         }
         else {
-          $ds = null;
+          $ds = NULL;
         }
       }
 
@@ -355,8 +353,8 @@ class CollectionPolicy extends XMLDatastream {
   }
 
   /**
-   * Gets the next available PID for the 
-   * content model specified by the DSID 
+   * Gets the next available PID for the
+   * content model specified by the DSID
    * parameter.
    *
    * @param string $dsid
@@ -364,7 +362,7 @@ class CollectionPolicy extends XMLDatastream {
    */
   public function getNextPid($dsid) {
     $ret = FALSE;
-    if (self::validDsid($dsid) && $this->validate()) {
+    if (self::valid_dsid($dsid) && $this->validate()) {
       $content_models = $this->xml->getElementsByTagName('content_models')->item(0)->getElementsByTagName('content_model');
       $namespace = FALSE;
       for ($i = 0; $namespace === FALSE && $i < $content_models->length; $i++) {
@@ -384,7 +382,7 @@ class CollectionPolicy extends XMLDatastream {
   /**
    * Gets a list of ContentModel objects supported by this collection.
    *
-   * @return ContentModel[] $models 
+   * @return ContentModel[] $models
    */
   function getContentModels() {
     $ret = FALSE;
@@ -393,7 +391,10 @@ class CollectionPolicy extends XMLDatastream {
       $ret = array();
       $content_models = $this->xml->getElementsByTagName('content_models')->item(0)->getElementsByTagName('content_model');
       for ($i = 0; $i < $content_models->length; $i++) {
-        $cm = ContentModel::loadFromModel($content_models->item($i)->getAttribute('pid'), $content_models->item($i)->getAttribute('dsid'), $content_models->item($i)->getAttribute('namespace'), $content_models->item($i)->getAttribute('name'));
+        $cm = ContentModel::loadFromModel($content_models->item($i)->getAttribute('pid'),
+            $content_models->item($i)->getAttribute('dsid'),
+            $content_models->item($i)->getAttribute('namespace'),
+            $content_models->item($i)->getAttribute('name'));
         if ($cm !== FALSE) {
           $ret[] = $cm;
         }
@@ -583,7 +584,7 @@ class CollectionPolicy extends XMLDatastream {
    */
   function addModel($cm, $namespace) {
     $ret = FALSE;
-    if (self::validPid($namespace) && $this->validate() && $cm->validate()) {
+    if (self::valid_pid($namespace) && $this->validate() && $cm->validate()) {
       $contentmodelsEl = $this->xml->getElementsByTagName('content_models');
       $models = $contentmodelsEl->item(0)->getElementsByTagName('content_model');
       $found = FALSE;

ConnectionHelper.inc

@@ -1,94 +1,94 @@
-<?php
-
-// $Id$
-
-/**
- * @file 
- * Connection Helper Class
- */
-module_load_include('inc', 'ConnectionHelper', '');
-
-/**
- * Connection Helper Class ??
- */
-class ConnectionHelper {
-
-  /**
-   * Constructor
-   */
-  function ConnectionHelper() {
-    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  }
-
-  /**
-   * fixURL ??
-   * @param type $url
-   * @param type $_name
-   * @param type $_pass
-   * @return string 
-   */
-  function _fixURL($url, $_name, $_pass) {
-    if (empty($url)) {
-      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
-    }
-
-    $creds = urlencode($_name) . ':' . urlencode($_pass);
-
-    if (strpos($url, 'http://') === 0) {
-      $new_url = 'http://' . $creds . '@' . substr($url, 7);
-    }
-    elseif (strpos($url, 'https://') === 0) {
-      $new_url = 'https://' . $creds . '@' . substr($url, 8);
-    }
-    else {
-      drupal_set_message(t('Invalid URL: !url', array('!url' => $url)));
-      return NULL;
-    }
-
-    return $new_url;
-  }
-
-  /**
-   * getSoapClient
-   * @global type $user
-   * @param type $url
-   * @param type $exceptions
-   * @return SoapClient 
-   */
-  function getSoapClient($url = NULL, $exceptions = TRUE) {
-    if (empty($url)) {
-      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
-    }
-
-    global $user;
-    if ($user->uid == 0) {
-      //anonymous user.  We will need an entry in the fedora users.xml file
-      //with the appropriate entry for a username of anonymous password of anonymous
-      try {
-        $client = new SoapClient($this->_fixURL($url, 'anonymous', 'anonymous'), array(
-              'login' => 'anonymous',
-              'password' => 'anonymous',
-              'exceptions' => $exceptions,
-            ));
-      } catch (SoapFault $e) {
-        drupal_set_message(t("!e", array('!e' => $e->getMessage())));
-        return NULL;
-      }
-    }
-    else {
-      try {
-        $client = new SoapClient($this->_fixURL($url, $user->name, $user->pass), array(
-              'login' => $user->name,
-              'password' => $user->pass,
-              'exceptions' => TRUE,
-            ));
-      } catch (SoapFault $e) {
-        drupal_set_message(t("!e", array('!e' => $e->getMessage())));
-        return NULL;
-      }
-    }
-    return $client;
-  }
-
-}
-
+<?php
+
+// $Id$
+
+/**
+ * @file 
+ * Connection Helper Class
+ */
+module_load_include('inc', 'ConnectionHelper', '');
+
+/**
+ * Connection Helper Class ??
+ */
+class ConnectionHelper {
+
+  /**
+   * Constructor
+   */
+  function ConnectionHelper() {
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+  }
+
+  /**
+   * fixURL ??
+   * @param type $url
+   * @param type $_name
+   * @param type $_pass
+   * @return string 
+   */
+  function _fixURL($url, $_name, $_pass) {
+    if (empty($url)) {
+      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
+    }
+
+    $creds = urlencode($_name) . ':' . urlencode($_pass);
+
+    if (strpos($url, 'http://') === 0) {
+      $new_url = 'http://' . $creds . '@' . substr($url, 7);
+    }
+    elseif (strpos($url, 'https://') === 0) {
+      $new_url = 'https://' . $creds . '@' . substr($url, 8);
+    }
+    else {
+      drupal_set_message(t('Invalid URL: !url', array('!url' => $url)));
+      return NULL;
+    }
+
+    return $new_url;
+  }
+
+  /**
+   * getSoapClient
+   * @global type $user
+   * @param type $url
+   * @param type $exceptions
+   * @return SoapClient 
+   */
+  function getSoapClient($url = NULL, $exceptions = TRUE) {
+    if (empty($url)) {
+      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
+    }
+
+    global $user;
+    if ($user->uid == 0) {
+      //anonymous user.  We will need an entry in the fedora users.xml file
+      //with the appropriate entry for a username of anonymous password of anonymous
+      try {
+        $client = new SoapClient($this->_fixURL($url, 'anonymous', 'anonymous'), array(
+            'login' => 'anonymous',
+            'password' => 'anonymous',
+            'exceptions' => $exceptions,
+          ));
+      } catch (SoapFault $e) {
+        drupal_set_message(t("!e", array('!e' => $e->getMessage())));
+        return NULL;
+      }
+    }
+    else {
+      try {
+        $client = new SoapClient($this->_fixURL($url, $user->name, $user->pass), array(
+            'login' => $user->name,
+            'password' => $user->pass,
+            'exceptions' => TRUE,
+          ));
+      } catch (SoapFault $e) {
+        drupal_set_message(t("!e", array('!e' => $e->getMessage())));
+        return NULL;
+      }
+    }
+    return $client;
+  }
+
+}
+

MimeClass.inc

@@ -3,7 +3,7 @@
 // $Id$
 
 /**
- *
+ * @file
  * This class inspired by Chris Jean's work, here:
  * http://chrisjean.com/2009/02/14/generating-mime-type-in-php-is-not-magic/
  * 

ObjectHelper.inc

@@ -60,7 +60,7 @@ class ObjectHelper {
     }
     $headers = module_invoke_all('file_download', "/fedora/repository/$pid/$dsID");
     if (in_array(-1, $headers)) {
-      drupal_set_message('hello');
+      drupal_set_message(t('hello'));
       drupal_access_denied();
 
       return ' ';
@@ -300,8 +300,8 @@ class ObjectHelper {
       }
       if ($allow) {
         $purgeImage = '<a title="purge datastream ' . $dataStreamValue->label . '" href="' . $base_url . '/fedora/repository/purgeStream/' .
-            $pid . '/' . $dataStreamValue->ID . '/' . $dataStreamValue->label . '"><img src="' . $base_url . '/' . $path .
-            '/images/purge.gif" alt="purge datastream" /></a>';
+          $pid . '/' . $dataStreamValue->ID . '/' . $dataStreamValue->label . '"><img src="' . $base_url . '/' . $path .
+          '/images/purge.gif" alt="purge datastream" /></a>';
       }
     }
     else {
@@ -329,7 +329,7 @@ class ObjectHelper {
     $mimeType = $dataStreamValue->MIMEType;
 
     $view = '<a href="' . $base_url . '/fedora/repository/' . drupal_urlencode($pid) . '/' . $id . '/' . drupal_urlencode($label) .
-        '" target="_blank" >' . t('View') . '</a>';
+      '" target="_blank" >' . t('View') . '</a>';
     $action = "$base_url/fedora/repository/object_download/" . drupal_urlencode($pid) . '/' . $id . '/' . drupal_urlencode(preg_replace('/\//i', '${1}_', $label)); // Necessary to handle the case of Datastream labels that contain slashes. Ugh.
     $downloadVersion = '<form method="GET" action="' . $action . '"><input type="submit" value="' . t('Download') . '"></form>';
     if (user_access(ObjectHelper :: $EDIT_FEDORA_METADATA)) {
@@ -383,7 +383,7 @@ class ObjectHelper {
       $input = new DomDocument();
       $input->loadXML(trim($xmlstr));
     } catch (exception $e) {
-      watchdog(t("Fedora_Repository"), t("Problem loading XSL file: !e", array('!e' => $e)), NULL, WATCHDOG_ERROR);
+      watchdog(t("Fedora_Repository"), "Problem loading XSL file: !e", array('!e' => $e), NULL, WATCHDOG_ERROR);
     }
     $xsl = $proc->importStylesheet($xsl);
     $newdom = $proc->transformToDoc($input);
@@ -416,7 +416,7 @@ class ObjectHelper {
       if ($allow) {
 
         $output .= '<br /><a title = "' . t('Edit Meta Data') . '" href="' . $base_url . '/fedora/repository/' . 'editmetadata/' . $pid . '/' .
-            $dsid . '"><img src="' . $base_url . '/' . $path . '/images/edit.gif" alt="' . t('Edit Meta Data') . '" /></a>';
+          $dsid . '"><img src="' . $base_url . '/' . $path . '/images/edit.gif" alt="' . t('Edit Meta Data') . '" /></a>';
       }
     }
     return $output;
@@ -560,7 +560,7 @@ class ObjectHelper {
     try {
       $sxml = new SimpleXMLElement($content_models);
     } catch (exception $e) {
-      watchdog(t("Fedora_Repository"), t("Could not find a parent object for %s", $pid), NULL, WATCHDOG_ERROR);
+      watchdog(t("Fedora_Repository"), "Could not find a parent object for %s", $pid, NULL, WATCHDOG_ERROR);
       return $pids;
     }
 
@@ -673,8 +673,8 @@ class ObjectHelper {
           if ($allow) {
             // $ingestObject = '<a title="'. t('Ingest a New object into ') . $collectionName . ' '. $collection_pid . '" href="'. base_path() .
             $ingestObject = '<a title="' . t('Ingest a New object into !collection_name PID !collection_pid', array('!collection_name' => $collectionName, '!collection_pid' => $collection_pid)) . '" href="' . base_path() .
-                'fedora/ingestObject/' . $collection_pid . '/' . $collectionName . '"><img src="' . $base_url . '/' . $path .
-                '/images/ingest.png" alt="' . t('Add a New Object') . '" class="icon"></a>' . t(' Add to this Collection');
+              'fedora/ingestObject/' . $collection_pid . '/' . $collectionName . '"><img src="' . $base_url . '/' . $path .
+              '/images/ingest.png" alt="' . t('Add a New Object') . '" class="icon"></a> ' . t('Add to this Collection');
           }
         }
       }
@@ -763,7 +763,7 @@ class ObjectHelper {
       $parent_collections_HTML .= '<a href="' . $uri . '">' . $collection_label . '</a><br />';
     }
     if (!empty($parent_collections_HTML)) {
-      $parent_collections_HTML = '<tr><td><h3>' . t("Belongs to these collections: ") . '</h3></td><td colspan="4">' . $parent_collections_HTML . '</td></tr>';
+      $parent_collections_HTML = '<tr><td><h3>' . t("Belongs to these collections:") . ' </h3></td><td colspan="4">' . $parent_collections_HTML . '</td></tr>';
     }
 
     return $parent_collections_HTML;
@@ -855,10 +855,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 <info:fedora/fedora-system:def/relations-external#hasMember> $o ' .
-        'and $o <dc:title> $title ' .
+      'where $s <info:fedora/fedora-system:def/relations-external#hasMember> $o ' .
+      'and $o <dc:title> $title ' .
 //    'and $o <dc:description> $desc '.
-        'and ( ';
+      'and ( ';
 
     foreach ($pids as $pid) {
       $query_string .= '$s <mulgara:is> <info:fedora/' . $pid . '> or ';
@@ -972,8 +972,8 @@ class ObjectHelper {
 
     $warnMess = "Creation of one or more datastreams failed.<hr  width='40%' align = 'left'/>";
     $configMess = "Please ensure that %app is installed and configured for this site. ";
-    drupal_set_message($warnMess, 'warning', false);
-    drupal_set_message(t($configMess . "<br />" . $messMap[$app] . "<hr  width='40%' align = 'left'/>", array('%app' => $app)), 'warning', false);
+    drupal_set_message($warnMess, 'warning', FALSE);
+    drupal_set_message(t($configMess . "<br />" . $messMap[$app] . "<hr  width='40%' align = 'left'/>", array('%app' => $app)), 'warning', FALSE);
   }
 
 }

SearchClass.inc

@@ -33,7 +33,7 @@ class SearchClass {
     try {
       $implementation = new $solrClass();
     } catch (Exception $e) {
-      watchdog(t("Fedora_Repository"), t("Error getting solr search results class: !message", array('!message' => $e->getMessage())), NULL, WATCHDOG_ERROR);
+      watchdog(t("Fedora_Repository"), "Error getting solr search results class: !message", array('!message' => $e->getMessage()), NULL, WATCHDOG_ERROR);
       return 'Error getting solr search results class.  Check watchdog for more info.';
     }
     return $implementation->$solrFunction($query, $startPage, $fq, $dismax);
@@ -55,7 +55,7 @@ class SearchClass {
 
     $andOrArray = array(
       'AND' => 'and',
-        //'OR' => 'or' //removed or for now as it would be a pain to parse
+      //'OR' => 'or' //removed or for now as it would be a pain to parse
     );
     $form = array();
 
@@ -137,7 +137,7 @@ class SearchClass {
       '#size' => '30',
       '#type' => 'textfield',
       '#title' => t(''),
-        // '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
+      // '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
     );
     $form['submit'] = array(
       '#type' => 'submit',
@@ -367,7 +367,7 @@ class SearchClass {
     $path = drupal_get_path('module', 'Fedora_Repository');
     $test = $xslt_file;
     $isRestricted = variable_get('fedora_namespace_restriction_enforced', TRUE);
-    if (!isRestricted && $xslt_file == null) {
+    if (!isRestricted && $xslt_file == NULL) {
       $xslt_file = '/xsl/unfilteredresults.xsl';
     }
     $proc = NULL;
@@ -431,7 +431,7 @@ class SearchClass {
     try {
       $proc = new XsltProcessor();
     } catch (Exception $e) {
-      drupal_set_message(t('Error loading results xslt! ') . $e->getMessage());
+      drupal_set_message(t('Error loading results xslt!') . " " . $e->getMessage());
       return ' ';
     }
 
@@ -507,7 +507,7 @@ class SearchClass {
 
     $andOrArray = array(
       'AND' => 'and',
-        //'OR' => 'or' //removed or for now as it would be a pain to parse
+      //'OR' => 'or' //removed or for now as it would be a pain to parse
     );
     $form = array();
 

SecurityClass.inc

@@ -1,223 +1,223 @@
-<?php
-
-// $Id$
-
-/**
- * @file 
- * SecurityClass Class
- */
-
-/**
- * SecurityClass ??
- */
-class SecurityClass {
-
-  public static $SECURITY_CLASS_SECURITY_STREAM = 'POLICY';
-
-  /**
-   * Constructor
-   */
-  function SecurityClass() {
-    module_load_include('inc', 'SecurityClass', '');
-    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  }
-
-  /**
-   * canIngestHere ??
-   * @global type $user
-   * @param type $collection_pid
-   * @return type 
-   */
-  function canIngestHere($collection_pid) {
-    global $user;
-    module_load_include('inc', 'fedora_repository', 'ObjectHelper');
-    $objectHelper = new ObjectHelper();
-    // get the childsecurity policy from the collection.
-    $policyStream = $objectHelper->getStream($collection_pid, SECURITYCLASS :: $SECURITY_CLASS_SECURITY_STREAM, FALSE);
-
-    if ($policyStream == NULL) {
-      // no child policy stream so collection is wide open to anyone to ingest, that has the permission ingest in Drupal.
-      // maybe we should return FALSE here?? would be more secure.
-      return TRUE;
-    }
-    $allowedUsersAndRoles = $this->getAllowedUsersAndRoles($policyStream);
-    if (!$allowedUsersAndRoles) {
-      // error processing stream so don't let them ingest here.
-      return FALSE;
-    }
-    $allowedUsers = $allowedUsersAndRoles["users"];
-    $allowedRoles = $allowedUsersAndRoles["roles"];
-
-    foreach ($user->roles as $role) {
-      if (in_array($role, $allowedRoles)) {
-        return TRUE;
-      }
-    }
-
-    if (in_array($user->name, $allowedUsers)) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * parses our simple xacml policies checking for users or roles that are allowed to ingest
-   * @param type $policyStream
-   * @return type 
-   */
-  function getAllowedUsersAndRoles($policyStream) {
-    $allowedRoles = array();
-    $allowedUsers = array();
-    $usersAndRoles = array();
-    try {
-      $xml = new SimpleXMLElement($policyStream);
-    } catch (Exception $e) {
-      watchdog(t("Fedora_Repository"), t("No roles found in security policy, could not parse policy stream."), NULL, WATCHDOG_ERROR);
-      //we may not want to send this to the screen.
-      drupal_set_message(t('No roles found in security policy, could not parse policy stream: !message', array('!message' => $e->getMessage())), 'error');
-      return NULL;
-    }
-    $xml->registerXPathNamespace('default', 'urn:oasis:names:tc:xacml:1.0:policy');
-
-    $conditions = $xml->xpath("//default:Condition");
-
-    foreach ($conditions as $condition) {
-      $designator = $condition->Apply->SubjectAttributeDesignator;
-      if (empty($designator)) {//$disignator may be wrapped by an or
-        $designator = $condition->Apply->Apply->SubjectAttributeDesignator;
-      }
-      $attributeId = strip_tags($designator['AttributeId']);
-
-      if ($attributeId == "fedoraRole") {
-        foreach ($condition->Apply->Apply->AttributeValue as $attributeValue) {
-          $allowedRoles[] = strip_tags($attributeValue->asXML());
-        }
-        foreach ($condition->Apply->Apply->Apply->AttributeValue as $attributeValue) {
-          $allowedRoles[] = strip_tags($attributeValue->asXML());
-        }
-      }
-      if ($attributeId == "urn:fedora:names:fedora:2.1:subject:loginId") {
-        foreach ($condition->Apply->Apply->AttributeValue as $attributeValue) {
-          $allowedUsers[] = strip_tags($attributeValue->asXML());
-        }
-        foreach ($condition->Apply->Apply->Apply->AttributeValue as $attributeValue) {
-          $allowedUsers[] = strip_tags($attributeValue->asXML());
-        }
-      }
-    }
-    $usersAndRoles['users'] = $allowedUsers;
-    $usersAndRoles['roles'] = $allowedRoles;
-    return $usersAndRoles;
-  }
-
-  /**
-   * When a user's profile is saved in drupal we will attempt to create a collection for them in Fedora
-   * this will be their personal space.  In the IR it is editable by users with the same role in the VRE
-   * it probably would not be.
-   * @param type $user
-   * @return DOMDocument 
-   */
-  function createPersonalPolicy($user) {
-    $doc = new DOMDocument();
-    try {
-      $doc->load(drupal_get_path('module', 'Fedora_Repository') . '/policies/noObjectEditPolicy.xml');
-    } catch (exception $e) {
-      watchdog(t("Fedora_Repository"), t("Problem loading policy file."), NULL, WATCHDOG_ERROR);
-    }
-    $conditions = $doc->getElementsByTagName('Condition');
-    foreach ($conditions as $condition) {
-      $designator = $condition->getElementsByTagName('SubjectAttributeDesignator');
-      foreach ($designator as $des) {
-        $attributeId = $des->getAttribute('AttributeId');
-        if ($attributeId == 'fedoraRole') {
-          $applies = $condition->getElementsByTagName('Apply');
-          foreach ($applies as $apply) {
-            $functionId = $apply->getAttribute('FunctionId');
-            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
-              foreach ($user->roles as $role) {
-                if (!($role == 'authenticated user' || $role == 'administrator')) { //don't want authenticated user included administrator already is included'
-                  $newAttributeValue = $doc->createElement('AttributeValue', '<![CDATA[' . $role . ']]>');
-                  $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
-                  // $newAttributeValue->setAttribute('MustBePresent', 'FALSE');
-                  $apply->appendChild($newAttributeValue);
-                }
-              }
-            }
-          }
-        }
-
-        if ($attributeId == 'urn:fedora:names:fedora:2.1:subject:loginId') {
-          $applies = $condition->getElementsByTagName('Apply');
-          foreach ($applies as $apply) {
-            $functionId = $apply->getAttribute('FunctionId');
-            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
-              $newAttributeValue = $doc->createElement('AttributeValue', $user->name);
-              $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
-              //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
-              $apply->appendChild($newAttributeValue);
-            }
-          }
-        }
-      }
-    }
-
-    return $doc; //NULL; //$xml;
-  }
-
-  /**
-   * Add a list of allowed users and roles to the given policy stream and return it.
-   *
-   * @param string $policy_stream
-   * @param array $users_and_roles
-   * @return DOMDocument
-   */
-  function set_allowed_users_and_roles(&$policy_stream, $users_and_roles) {
-    $allowed_roles = $users_and_roles['roles'];
-    $allowed_users = $users_and_roles['users'];
-    $dom = new DOMDocument();
-    $dom->loadXML($policy_stream);
-    $conditions = $dom->getElementsByTagName('Condition');
-    foreach ($conditions as $condition) {
-      $designator = $condition->getElementsByTagName('SubjectAttributeDesignator');
-      foreach ($designator as $des) {
-        $attributeId = $des->getAttribute('AttributeId');
-        if ($attributeId == 'fedoraRole') {
-          // $applies = $condition->getElementsByTagName('Apply');
-          $applies = $des->parentNode->getElementsByTagName('Apply');
-          foreach ($applies as $apply) {
-            $functionId = $apply->getAttribute('FunctionId');
-            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
-              foreach ($allowed_roles as $role) {
-                if (!($role == 'authenticated user' || $role == 'administrator')) { //don't want authenticated user included administrator already is included'
-                  $newAttributeValue = $dom->createElement('AttributeValue', $role);
-                  $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
-                  //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
-                  $apply->appendChild($newAttributeValue);
-                }
-              }
-            }
-          }
-        }
-
-        if ($attributeId == 'urn:fedora:names:fedora:2.1:subject:loginId') {
-          // $applies = $condition->getElementsByTagName('Apply');
-          $applies = $des->parentNode->getElementsByTagName('Apply');
-          foreach ($applies as $apply) {
-            $functionId = $apply->getAttribute('FunctionId');
-            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
-              foreach ($allowed_users as $username) {
-                $newAttributeValue = $dom->createElement('AttributeValue', $username);
-                $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
-                //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
-                $apply->appendChild($newAttributeValue);
-              }
-            }
-          }
-        }
-      }
-    }
-    // $this->collection_policy_stream = $dom->saveXML();
-    return $dom->saveXML();
-  }
-
-}
+<?php
+
+// $Id$
+
+/**
+ * @file 
+ * SecurityClass Class
+ */
+
+/**
+ * SecurityClass ??
+ */
+class SecurityClass {
+
+  public static $SECURITY_CLASS_SECURITY_STREAM = 'POLICY';
+
+  /**
+   * Constructor
+   */
+  function SecurityClass() {
+    module_load_include('inc', 'SecurityClass', '');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+  }
+
+  /**
+   * canIngestHere ??
+   * @global type $user
+   * @param type $collection_pid
+   * @return type 
+   */
+  function canIngestHere($collection_pid) {
+    global $user;
+    module_load_include('inc', 'fedora_repository', 'ObjectHelper');
+    $objectHelper = new ObjectHelper();
+    // get the childsecurity policy from the collection.
+    $policyStream = $objectHelper->getStream($collection_pid, SECURITYCLASS :: $SECURITY_CLASS_SECURITY_STREAM, FALSE);
+
+    if ($policyStream == NULL) {
+      // no child policy stream so collection is wide open to anyone to ingest, that has the permission ingest in Drupal.
+      // maybe we should return FALSE here?? would be more secure.
+      return TRUE;
+    }
+    $allowedUsersAndRoles = $this->getAllowedUsersAndRoles($policyStream);
+    if (!$allowedUsersAndRoles) {
+      // error processing stream so don't let them ingest here.
+      return FALSE;
+    }
+    $allowedUsers = $allowedUsersAndRoles["users"];
+    $allowedRoles = $allowedUsersAndRoles["roles"];
+
+    foreach ($user->roles as $role) {
+      if (in_array($role, $allowedRoles)) {
+        return TRUE;
+      }
+    }
+
+    if (in_array($user->name, $allowedUsers)) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * parses our simple xacml policies checking for users or roles that are allowed to ingest
+   * @param type $policyStream
+   * @return type 
+   */
+  function getAllowedUsersAndRoles($policyStream) {
+    $allowedRoles = array();
+    $allowedUsers = array();
+    $usersAndRoles = array();
+    try {
+      $xml = new SimpleXMLElement($policyStream);
+    } catch (Exception $e) {
+      watchdog(t("Fedora_Repository"), t("No roles found in security policy, could not parse policy stream."), NULL, WATCHDOG_ERROR);
+      //we may not want to send this to the screen.
+      drupal_set_message(t('No roles found in security policy, could not parse policy stream: !message', array('!message' => $e->getMessage())), 'error');
+      return NULL;
+    }
+    $xml->registerXPathNamespace('default', 'urn:oasis:names:tc:xacml:1.0:policy');
+
+    $conditions = $xml->xpath("//default:Condition");
+
+    foreach ($conditions as $condition) {
+      $designator = $condition->Apply->SubjectAttributeDesignator;
+      if (empty($designator)) {//$disignator may be wrapped by an or
+        $designator = $condition->Apply->Apply->SubjectAttributeDesignator;
+      }
+      $attributeId = strip_tags($designator['AttributeId']);
+
+      if ($attributeId == "fedoraRole") {
+        foreach ($condition->Apply->Apply->AttributeValue as $attributeValue) {
+          $allowedRoles[] = strip_tags($attributeValue->asXML());
+        }
+        foreach ($condition->Apply->Apply->Apply->AttributeValue as $attributeValue) {
+          $allowedRoles[] = strip_tags($attributeValue->asXML());
+        }
+      }
+      if ($attributeId == "urn:fedora:names:fedora:2.1:subject:loginId") {
+        foreach ($condition->Apply->Apply->AttributeValue as $attributeValue) {
+          $allowedUsers[] = strip_tags($attributeValue->asXML());
+        }
+        foreach ($condition->Apply->Apply->Apply->AttributeValue as $attributeValue) {
+          $allowedUsers[] = strip_tags($attributeValue->asXML());
+        }
+      }
+    }
+    $usersAndRoles['users'] = $allowedUsers;
+    $usersAndRoles['roles'] = $allowedRoles;
+    return $usersAndRoles;
+  }
+
+  /**
+   * When a user's profile is saved in drupal we will attempt to create a collection for them in Fedora
+   * this will be their personal space.  In the IR it is editable by users with the same role in the VRE
+   * it probably would not be.
+   * @param type $user
+   * @return DOMDocument 
+   */
+  function createPersonalPolicy($user) {
+    $doc = new DOMDocument();
+    try {
+      $doc->load(drupal_get_path('module', 'Fedora_Repository') . '/policies/noObjectEditPolicy.xml');
+    } catch (exception $e) {
+      watchdog(t("Fedora_Repository"), t("Problem loading policy file."), NULL, WATCHDOG_ERROR);
+    }
+    $conditions = $doc->getElementsByTagName('Condition');
+    foreach ($conditions as $condition) {
+      $designator = $condition->getElementsByTagName('SubjectAttributeDesignator');
+      foreach ($designator as $des) {
+        $attributeId = $des->getAttribute('AttributeId');
+        if ($attributeId == 'fedoraRole') {
+          $applies = $condition->getElementsByTagName('Apply');
+          foreach ($applies as $apply) {
+            $functionId = $apply->getAttribute('FunctionId');
+            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
+              foreach ($user->roles as $role) {
+                if (!($role == 'authenticated user' || $role == 'administrator')) { //don't want authenticated user included administrator already is included'
+                  $newAttributeValue = $doc->createElement('AttributeValue', '<![CDATA[' . $role . ']]>');
+                  $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
+                  // $newAttributeValue->setAttribute('MustBePresent', 'FALSE');
+                  $apply->appendChild($newAttributeValue);
+                }
+              }
+            }
+          }
+        }
+
+        if ($attributeId == 'urn:fedora:names:fedora:2.1:subject:loginId') {
+          $applies = $condition->getElementsByTagName('Apply');
+          foreach ($applies as $apply) {
+            $functionId = $apply->getAttribute('FunctionId');
+            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
+              $newAttributeValue = $doc->createElement('AttributeValue', $user->name);
+              $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
+              //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
+              $apply->appendChild($newAttributeValue);
+            }
+          }
+        }
+      }
+    }
+
+    return $doc; //NULL; //$xml;
+  }
+
+  /**
+   * Add a list of allowed users and roles to the given policy stream and return it.
+   *
+   * @param string $policy_stream
+   * @param array $users_and_roles
+   * @return DOMDocument
+   */
+  function set_allowed_users_and_roles(&$policy_stream, $users_and_roles) {
+    $allowed_roles = $users_and_roles['roles'];
+    $allowed_users = $users_and_roles['users'];
+    $dom = new DOMDocument();
+    $dom->loadXML($policy_stream);
+    $conditions = $dom->getElementsByTagName('Condition');
+    foreach ($conditions as $condition) {
+      $designator = $condition->getElementsByTagName('SubjectAttributeDesignator');
+      foreach ($designator as $des) {
+        $attributeId = $des->getAttribute('AttributeId');
+        if ($attributeId == 'fedoraRole') {
+          // $applies = $condition->getElementsByTagName('Apply');
+          $applies = $des->parentNode->getElementsByTagName('Apply');
+          foreach ($applies as $apply) {
+            $functionId = $apply->getAttribute('FunctionId');
+            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
+              foreach ($allowed_roles as $role) {
+                if (!($role == 'authenticated user' || $role == 'administrator')) { //don't want authenticated user included administrator already is included'
+                  $newAttributeValue = $dom->createElement('AttributeValue', $role);
+                  $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
+                  //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
+                  $apply->appendChild($newAttributeValue);
+                }
+              }
+            }
+          }
+        }
+
+        if ($attributeId == 'urn:fedora:names:fedora:2.1:subject:loginId') {
+          // $applies = $condition->getElementsByTagName('Apply');
+          $applies = $des->parentNode->getElementsByTagName('Apply');
+          foreach ($applies as $apply) {
+            $functionId = $apply->getAttribute('FunctionId');
+            if ($functionId == 'urn:oasis:names:tc:xacml:1.0:function:string-bag') {
+              foreach ($allowed_users as $username) {
+                $newAttributeValue = $dom->createElement('AttributeValue', $username);
+                $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
+                //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
+                $apply->appendChild($newAttributeValue);
+              }
+            }
+          }
+        }
+      }
+    }
+    // $this->collection_policy_stream = $dom->saveXML();
+    return $dom->saveXML();
+  }
+
+}

XMLDatastream.inc

@@ -1,6 +1,9 @@
 <?php
 
-// $Id$
+/**
+ * @file 
+ * 
+ */
 
 /**
  * @file 
@@ -31,7 +34,7 @@ abstract class XMLDatastream {
   }
 
   /**
-   * validPid
+   * valid_pid
    * Validates a fedora PID based on the regexp provided in the fedora 
    * 3.3 documentation.  
    * http://www.fedora-commons.org/confluence/display/FCR30/Fedora+Identifiers
@@ -39,7 +42,7 @@ abstract class XMLDatastream {
    * @param String $pid
    * @return boolean $valid
    */
-  public static function validPid($pid) {
+  public static function valid_pid($pid) {
     $valid = FALSE;
     if (strlen(trim($pid)) <= 64 && preg_match('/^([A-Za-z0-9]|-|\.)+:(([A-Za-z0-9])|-|\.|~|_|(%[0-9A-F]{2}))+$/', trim($pid))) {
       $valid = TRUE;
@@ -49,7 +52,7 @@ abstract class XMLDatastream {
   }
 
   /**
-   * validDsid
+   * valid_dsid
    * Validates a fedora Dsid based on the the allowed XML standard NCName. 
    * The regexp is a "regular" subset of names allowed, it excludes some extended hex characters that are
    * technically permitted.
@@ -58,7 +61,7 @@ abstract class XMLDatastream {
    * @param String $pid
    * @return boolean $valid
    */
-  public static function validDsid($dsid) {
+  public static function valid_dsid($dsid) {
     $valid = FALSE;
     if (strlen(trim($dsid)) <= 64 && preg_match('/^[a-zA-Z0-9\_\-\.]+$/', trim($dsid))) {
       $valid = TRUE;

api/dublin_core.inc

@@ -60,7 +60,7 @@ class Dublin_Core {
   /**
    * Replace the given DC element with the values in $values
    * @param string $elemnt_name
-   * @param array $values 
+   * @param array $values
    */
   function set_element($element_name, $values) {
     if (is_array($values)) {

api/fedora_collection.inc

@@ -56,7 +56,7 @@ function export_collection($collection_pid, $relationship = 'isMemberOfCollectio
     }
   }
   else {
-    drupal_set_message("Error creating temp directory for batch export.", 'error');
+    drupal_set_message(t("Error creating temp directory for batch export."), 'error');
     return FALSE;
   }
   return TRUE;

api/fedora_export.inc

@@ -100,14 +100,14 @@ function export_foxml_for_pid($pid, $dir, $paths, &$log, $format = FOXML_11, $re
   // Remove rdf elements added during ingest (if present)
   if ($remove_islandora) {
     $xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-    $descNode = $xpath->query("//rdf:RDF/rdf:Description")->item(0);
+    $desc_node = $xpath->query("//rdf:RDF/rdf:Description")->item(0);
 
-    if ($model = $descNode->getElementsByTagName('hasModel')->item(0)) {
-      $descNode->removeChild($model);
+    if ($model = $desc_node->getElementsByTagName('hasModel')->item(0)) {
+      $desc_node->removeChild($model);
     }
 
-    if ($member = $descNode->getElementsByTagName('rel:isMemberOfCollection')->item(0)) {
-      $descNode->removeChild($member);
+    if ($member = $desc_node->getElementsByTagName('rel:isMemberOfCollection')->item(0)) {
+      $desc_node->removeChild($member);
     }
   }
 
@@ -121,24 +121,24 @@ function export_foxml_for_pid($pid, $dir, $paths, &$log, $format = FOXML_11, $re
 
         // Update datastream uris
         $xpath->registerNamespace('foxml', 'info:fedora/fedora-system:def/foxml#');
-        foreach ($xpath->query("//foxml:datastream[@ID]") as $dsNode) {
+        foreach ($xpath->query("//foxml:datastream[@ID]") as $ds_node) {
 
           // Don't update datastreams having external uris
-          if (in_array($dsNode->getAttribute('CONTROL_GROUP'), $disallowed_groups)) {
+          if (in_array($ds_node->getAttribute('CONTROL_GROUP'), $disallowed_groups)) {
             continue;
           }
 
-          $dsId = $dsNode->getAttribute('ID');
+          $ds_id = $ds_node->getAttribute('ID');
 
           // Remove QUERY datastream
-          if ($dsId == "QUERY") {
-            $parentNode = $xpath->query('/foxml:digitalObject')->item(0);
-            $parentNode->removeChild($dsNode);
+          if ($ds_id == "QUERY") {
+            $parent_node = $xpath->query('/foxml:digitalObject')->item(0);
+            $parent_node->removeChild($ds_node);
           }
 
-          foreach ($dsNode->getElementsByTagName('*') as $contentNode) {
-            if ($str = $contentNode->getAttribute('REF')) {
-              $contentNode->setAttribute('REF', url($paths[$dsId], array('absolute' => TRUE)));
+          foreach ($ds_node->getElementsByTagName('*') as $content_node) {
+            if ($str = $content_node->getAttribute('REF')) {
+              $content_node->setAttribute('REF', url($paths[$ds_id], array('absolute' => TRUE)));
             }
           }
         }
@@ -148,29 +148,29 @@ function export_foxml_for_pid($pid, $dir, $paths, &$log, $format = FOXML_11, $re
       case METS_11:
         // Update datastream uris
         $xpath->registerNamespace('METS', 'http://www.loc.gov/METS/');
-        foreach ($xpath->query('//METS:fileGrp[@ID="DATASTREAMS"]/METS:fileGrp') as $dsNode) {
+        foreach ($xpath->query('//METS:fileGrp[@ID="DATASTREAMS"]/METS:fileGrp') as $ds_node) {
 
-          $dsId = $dsNode->getAttribute('ID');
+          $ds_id = $ds_node->getAttribute('ID');
 
           // Remove QUERY datastream
-          if ($dsId == "QUERY") {
-            $parentNode = $xpath->query('//METS:fileGrp[@ID="DATASTREAMS"]')->item(0);
-            $parentNode->removeChild($dsNode);
+          if ($ds_id == "QUERY") {
+            $parent_node = $xpath->query('//METS:fileGrp[@ID="DATASTREAMS"]')->item(0);
+            $parent_node->removeChild($ds_node);
           }
 
           $xpath->registerNamespace('xlink', 'http://www.loc.gov/METS/');
-          foreach ($xpath->query('METS:file[@OWNERID!="E"][@OWNERID!="R"]/METS:FLocat[@xlink:href]', $dsNode) as $Floc) {
-            $Floc->setAttribute('xlink:href', url($paths[$dsId], array('absolute' => TRUE)));
+          foreach ($xpath->query('METS:file[@OWNERID!="E"][@OWNERID!="R"]/METS:FLocat[@xlink:href]', $ds_node) as $floc) {
+            $floc->setAttribute('xlink:href', url($paths[$ds_id], array('absolute' => TRUE)));
           }
           /*
-            foreach ($dsNode->getElementsByTagName('METS:file') as $contentNode) {
+            foreach ($ds_node->getElementsByTagName('METS:file') as $content_node) {
             // Don't update datastreams having external uris
-            if (in_array($dsNode->getAttribute('OWNERID'), $disallowed_groups)) {
+            if (in_array($ds_node->getAttribute('OWNERID'), $disallowed_groups)) {
             continue;
             }
 
-            foreach ($xpath->('METS:FLocat[@xlink:href]', $contentNode) as $Floc) {
-            $Floc->setAttribute('xlink:href', url($paths[$dsId], array('absolute' => true)));
+            foreach ($xpath->('METS:FLocat[@xlink:href]', $content_node) as $floc) {
+            $floc->setAttribute('xlink:href', url($paths[$ds_id], array('absolute' => true)));
             }
             `}
            */
@@ -201,8 +201,8 @@ function export_foxml_for_pid($pid, $dir, $paths, &$log, $format = FOXML_11, $re
  * @param type $mimeType
  * @return type 
  */
-function get_file_extension($mimeType) {
-  return substr(strstr($mimeType, '/'), 1);
+function get_file_extension($mime_type) {
+  return substr(strstr($mime_type, '/'), 1);
 }
 
 /**

api/fedora_item.inc

@@ -1,6 +1,10 @@
 <?php
 
-// $Id$
+
+/**
+ * @file 
+ * 
+ */
 
 /**
  * @file
@@ -76,7 +80,7 @@ class Fedora_Item {
    * @param type $logMessage
    * @return type 
    */
-  function add_datastream_from_file($datastream_file, $datastream_id, $datastream_label = NULL, $datastream_mimetype = '', $controlGroup = 'M', $logMessage = null) {
+  function add_datastream_from_file($datastream_file, $datastream_id, $datastream_label = NULL, $datastream_mimetype = '', $controlGroup = 'M', $logMessage = NULL) {
     module_load_include('inc', 'fedora_repository', 'MimeClass');
     if (empty($datastream_mimetype)) {
       // Get mime type from the file extension.
@@ -107,7 +111,7 @@ class Fedora_Item {
    * @param type $logMessage
    * @return type 
    */
-  function add_datastream_from_url($datastream_url, $datastream_id, $datastream_label = NULL, $datastream_mimetype = '', $controlGroup = 'M', $logMessage = null) {
+  function add_datastream_from_url($datastream_url, $datastream_id, $datastream_label = NULL, $datastream_mimetype = '', $controlGroup = 'M', $logMessage = NULL) {
     if (empty($datastream_label)) {
       $datastream_label = $datastream_id;
     }
@@ -125,7 +129,7 @@ class Fedora_Item {
       'dsState' => 'A',
       'checksumType' => 'DISABLED',
       'checksum' => 'none',
-      'logMessage' => ($logMessage != null) ? $logMessage : 'Ingested object ' . $datastream_id
+      'logMessage' => ($logMessage != NULL) ? $logMessage : 'Ingested object ' . $datastream_id
     );
 
 
@@ -142,7 +146,7 @@ class Fedora_Item {
    * @param type $logMessage
    * @return type 
    */
-  function add_datastream_from_string($str, $datastream_id, $datastream_label = NULL, $datastream_mimetype = 'text/xml', $controlGroup = 'M', $logMessage = null) {
+  function add_datastream_from_string($str, $datastream_id, $datastream_label = NULL, $datastream_mimetype = 'text/xml', $controlGroup = 'M', $logMessage = NULL) {
     $dir = sys_get_temp_dir();
     $tmpfilename = tempnam($dir, 'fedoratmp');
     $tmpfile = fopen($tmpfilename, 'w');
@@ -310,7 +314,7 @@ class Fedora_Item {
       }
       $cursor += count($resultelements->resultList->objectFields);
       if (count($resultelements->resultList->objectFields) < $max_results
-          || count($resultelements->resultList->objectFields) == 0) {
+        || count($resultelements->resultList->objectFields) == 0) {
         $done = TRUE;
       }
       foreach ($resultelements->resultList->objectFields as $obj) {
@@ -402,7 +406,7 @@ class Fedora_Item {
    * @param type $as_of_date_time
    * @return string 
    */
-  function get_dissemination($service_definition_pid, $method_name, $parameters = array(), $as_of_date_time = null) {
+  function get_dissemination($service_definition_pid, $method_name, $parameters = array(), $as_of_date_time = NULL) {
     $params = array(
       'pid' => $this->pid,
       'serviceDefinitionPid' => $service_definition_pid,
@@ -546,7 +550,7 @@ class Fedora_Item {
     try {
       $relsext = $this->get_datastream_dissemination('RELS-EXT');
     } catch (exception $e) {
-      drupal_set_message("Error retrieving RELS-EXT of object $pid", 'error');
+      drupal_set_message(t("Error retrieving RELS-EXT of object $pid"), 'error');
       return $relationships;
     }
 
@@ -582,12 +586,12 @@ class Fedora_Item {
     // Verify the array format and that it isn't empty.
     if (!empty($relationships)) {
       $relsextxml = '<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fedora="info:fedora/fedora-system:def/relations-external#" xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">'
-          . '<rdf:description rdf:about="' . $this->pid . '">';
+        . '<rdf:description rdf:about="' . $this->pid . '">';
 
       foreach ($relationships as $rel) {
         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(t("Error with relationship format: " . $rel['subject'] . " - " . $rel['predicate'] . ' - ' . $rel['object']), "error");
           return FALSE;
         }
       }
@@ -727,7 +731,7 @@ class Fedora_Item {
    * @param type $quiet
    * @return type 
    */
-  function modify_object($label = '', $state = null, $ownerId = null, $logMessage = 'Modified by Islandora API', $quiet=TRUE) {
+  function modify_object($label = '', $state = NULL, $ownerId = NULL, $logMessage = 'Modified by Islandora API', $quiet=TRUE) {
 
     $params = array(
       'pid' => $this->pid,
@@ -828,7 +832,7 @@ class Fedora_Item {
             $result = $soap_client->__soapCall($function_name, array('parameters' => $params_array));
           }
           else {
-            watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
+            watchdog(t("FEDORA_REPOSITORY"), "Error trying to get SOAP client connection.");
             return NULL;
           }
         } catch (exception $e) {
@@ -841,7 +845,7 @@ class Fedora_Item {
               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);
+            watchdog(t("FEDORA_REPOSITORY"), "Error Trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e), NULL, WATCHDOG_ERROR);
           }
           return NULL;
         }
@@ -854,13 +858,13 @@ class Fedora_Item {
             $result = $soap_client->__soapCall($function_name, array('parameters' => $params_array));
           }
           else {
-            watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
+            watchdog(t("FEDORA_REPOSITORY"), "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);
+            watchdog(t("FEDORA_REPOSITORY"), "Error trying to call SOAP function !fn: !e", array('!fn' => $function_name, '!e' => $e), NULL, WATCHDOG_ERROR);
           }
           return NULL;
         }

api/fedora_utils.inc

@@ -12,7 +12,7 @@
  */
 if (!function_exists('str_getcsv')) {
 
-  function str_getcsv($input, $delimiter=',', $enclosure='"', $escape=null, $eol=null) {
+  function str_getcsv($input, $delimiter=',', $enclosure='"', $escape=NULL, $eol=NULL) {
     $temp = fopen("php://memory", "rw");
     fwrite($temp, $input);
     fseek($temp, 0);
@@ -109,7 +109,7 @@ function fix_encoding($in_str) {
  * @param type $pid
  * @return boolean 
  */
-function validPid($pid) {
+function valid_pid($pid) {
   $valid = FALSE;
   if (strlen(trim($pid)) <= 64 && preg_match('/^([A-Za-z0-9]|-|\.)+:(([A-Za-z0-9])|-|\.|~|_|(%[0-9A-F]{2}))+$/', trim($pid))) {
     $valid = TRUE;
@@ -123,7 +123,7 @@ function validPid($pid) {
  * @param type $dsid
  * @return boolean 
  */
-function validDsid($dsid) {
+function valid_dsid($dsid) {
   $valid = FALSE;
   if (strlen(trim($dsid)) <= 64 && preg_match('/^[a-zA-Z0-9\_\-\.]+$/', trim($dsid))) {
     $valid = TRUE;
@@ -137,7 +137,7 @@ function validDsid($dsid) {
  * @param type $dsid
  * @return string 
  */
-function fixDsid($dsid) {
+function fix_dsid($dsid) {
   $new_dsid = trim($dsid);
 
   $find = '/[^a-zA-Z0-9\.\_\-]/';

api/rels-ext.inc

@@ -21,7 +21,6 @@ class RelsExt {
    * the repository for the given Fedora_Item.
    * @param Fedora_Item $item
    */
-
   function RelsExt($item) {
     $relsextxml = $item->get_datastream_dissemination('RELS-EXT');
   }

api/tagging.inc

@@ -69,7 +69,7 @@ class TagSet {
         $this->item->modify_datastream_by_value($tagdoc->saveXML(), $this->tagsDSID, 'Tags', 'text/xml', 'X');
       }
     } catch (exception $e) {
-      drupal_set_message('There was an error saving the tags datastream: !e', array('!e' => $e), 'error');
+      drupal_set_message(t('There was an error saving the tags datastream: !e'), array('!e' => $e), 'error');
       return FALSE;
     }
     return TRUE;

collection_policies/COLLECTION-COLLECTION POLICY.xml

@@ -1,21 +1,22 @@
+
 <collection_policy name="" xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
-  <content_models>
-    <content_model dsid="ISLANDORACM" name="Collection" namespace="islandora:collection" pid="islandora:collectionCModel"/>
-  </content_models>
-  <search_terms>
-    <term field="dc.title">dc.title</term>
-    <term field="dc.creator">dc.creator</term>
-    <term default="true" field="dc.description">dc.description</term>
-    <term field="dc.date">dc.date</term>
-    <term field="dc.identifier">dc.identifier</term>
-    <term field="dc.language">dc.language</term>
-    <term field="dc.publisher">dc.publisher</term>
-    <term field="dc.rights">dc.rights</term>
-    <term field="dc.subject">dc.subject</term>
-    <term field="dc.relation">dc.relation</term>
-    <term field="dcterms.temporal">dcterms.temporal</term>
-    <term field="dcterms.spatial">dcterms.spatial</term>
-    <term field="fgs.DS.first.text">Full Text</term>
-  </search_terms>
-  <relationship>isMemberOfCollection</relationship>
+    <content_models>
+        <content_model dsid="ISLANDORACM" name="Collection" namespace="islandora:collection" pid="islandora:collectionCModel"/>
+    </content_models>
+    <search_terms>
+        <term field="dc.title">dc.title</term>
+        <term field="dc.creator">dc.creator</term>
+        <term default="true" field="dc.description">dc.description</term>
+        <term field="dc.date">dc.date</term>
+        <term field="dc.identifier">dc.identifier</term>
+        <term field="dc.language">dc.language</term>
+        <term field="dc.publisher">dc.publisher</term>
+        <term field="dc.rights">dc.rights</term>
+        <term field="dc.subject">dc.subject</term>
+        <term field="dc.relation">dc.relation</term>
+        <term field="dcterms.temporal">dcterms.temporal</term>
+        <term field="dcterms.spatial">dcterms.spatial</term>
+        <term field="fgs.DS.first.text">Full Text</term>
+    </search_terms>
+    <relationship>isMemberOfCollection</relationship>
 </collection_policy>

collection_policies/FLV-COLLECTION POLICY.xml

@@ -7,8 +7,8 @@
             <pid>vre:contentmodel</pid>
             <dsid>STANDARD_FLV</dsid>
         </contentmodel>
-        </contentmodels>
-     <search_terms>
+    </contentmodels>
+    <search_terms>
         <!--define what fields we can query as part of the advanced search for this collection-->
         <default>dc.description</default>
         <term>
@@ -63,5 +63,5 @@
             <field>fgs.DS.first.text</field>
             <value>Full Text</value>
         </term>
-    </search_terms>    
+    </search_terms>
 </collection_policy>

collection_policies/JPG-COLLECTION POLICY.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd"> 
-  <content_models> 
-    <content_model name="STANDARD_JPEG" dsid="ISLANDORACM" namespace="demo:Smiley" pid="demo:DualResImage"/> 
-  </content_models> 
-  <search_terms> 
-    <term field="dc.title">dc.title</term> 
-    <term field="dc.creator">dc.creator</term> 
-    <term field="dc.description" default="true">dc.description</term> 
-    <term field="dc.date">dc.date</term> 
-    <term field="dc.identifier">dc.identifier</term> 
-    <term field="dc.language">dc.language</term> 
-    <term field="dc.publisher">dc.publisher</term> 
-    <term field="dc.rights">dc.rights</term> 
-    <term field="dc.subject">dc.subject</term> 
-    <term field="dc.relation">dc.relation</term> 
-    <term field="dcterms.temporal">dcterms.temporal</term> 
-    <term field="dcterms.spatial">dcterms.spatial</term> 
-    <term field="fgs.DS.first.text">Full Text</term> 
-  </search_terms> 
-  <relationship>isMemberOf</relationship> 
+    <content_models>
+        <content_model name="STANDARD_JPEG" dsid="ISLANDORACM" namespace="demo:Smiley" pid="demo:DualResImage"/>
+    </content_models>
+    <search_terms>
+        <term field="dc.title">dc.title</term>
+        <term field="dc.creator">dc.creator</term>
+        <term field="dc.description" default="true">dc.description</term>
+        <term field="dc.date">dc.date</term>
+        <term field="dc.identifier">dc.identifier</term>
+        <term field="dc.language">dc.language</term>
+        <term field="dc.publisher">dc.publisher</term>
+        <term field="dc.rights">dc.rights</term>
+        <term field="dc.subject">dc.subject</term>
+        <term field="dc.relation">dc.relation</term>
+        <term field="dcterms.temporal">dcterms.temporal</term>
+        <term field="dcterms.spatial">dcterms.spatial</term>
+        <term field="fgs.DS.first.text">Full Text</term>
+    </search_terms>
+    <relationship>isMemberOf</relationship>
 </collection_policy>

collection_policies/PDF-COLLECTION POLICY.xml

@@ -1 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?> <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd"> <content_models> <content_model name="STANDARD_PDF" dsid="ISLANDORACM" namespace="islandora:spdf" pid="islandora:standard_pdf"/> <content_model name="STRICT_PDF" dsid="ISLANDORACM" namespace="islandora:strictpdf" pid="islandora:strict_pdf"/> <content_model name="REFWORKS_BATCH" dsid="ISLANDORACM" namespace="islandora:ref" pid="islandora:refworks_cm"/> </content_models> <search_terms> <term field="dc.title">dc.title</term> <term field="dc.creator">dc.creator</term> <term field="dc.description" default="true">dc.description</term> <term field="dc.date">dc.date</term> <term field="dc.identifier">dc.identifier</term> <term field="dc.language">dc.language</term> <term field="dc.publisher">dc.publisher</term> <term field="dc.rights">dc.rights</term> <term field="dc.subject">dc.subject</term> <term field="dc.relation">dc.relation</term> <term field="dcterms.temporal">dcterms.temporal</term> <term field="dcterms.spatial">dcterms.spatial</term> <term field="fgs.DS.first.text">Full Text</term> </search_terms> <relationship>isMemberOfCollection</relationship> </collection_policy>
+<?xml version="1.0" encoding="utf-8"?>
+<collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd"> 
+    <content_models>
+        <content_model name="STANDARD_PDF" dsid="ISLANDORACM" namespace="islandora:spdf" pid="islandora:standard_pdf"/>
+        <content_model name="STRICT_PDF" dsid="ISLANDORACM" namespace="islandora:strictpdf" pid="islandora:strict_pdf"/>
+        <content_model name="REFWORKS_BATCH" dsid="ISLANDORACM" namespace="islandora:ref" pid="islandora:refworks_cm"/>
+    </content_models>
+    <search_terms>
+        <term field="dc.title">dc.title</term>
+        <term field="dc.creator">dc.creator</term>
+        <term field="dc.description" default="true">dc.description</term>
+        <term field="dc.date">dc.date</term>
+        <term field="dc.identifier">dc.identifier</term>
+        <term field="dc.language">dc.language</term>
+        <term field="dc.publisher">dc.publisher</term>
+        <term field="dc.rights">dc.rights</term>
+        <term field="dc.subject">dc.subject</term>
+        <term field="dc.relation">dc.relation</term>
+        <term field="dcterms.temporal">dcterms.temporal</term>
+        <term field="dcterms.spatial">dcterms.spatial</term>
+        <term field="fgs.DS.first.text">Full Text</term>
+    </search_terms>
+    <relationship>isMemberOfCollection</relationship>
+</collection_policy>

collection_policies/PERSONAL-COLLECTION-POLICY.xml

@@ -1,3 +1,4 @@
+
 <collection_policy>
     <!---we will define allowed mimetypes and what to do with various types as part of the content model-->
     <contentmodels>
@@ -11,7 +12,7 @@
             <pid>vre:contentmodel</pid>
             <dsid>STANDARD_PDF</dsid>
         </contentmodel>
-		<contentmodel name="STANDARD_IMAGE">
+        <contentmodel name="STANDARD_IMAGE">
             <pid_namespace>ir:image</pid_namespace>
             <pid>vre:contentmodel</pid>
             <dsid>STANDARD_IMAGE</dsid>

collection_policies/RIRI COLLECTION POLICY.xml

@@ -63,5 +63,5 @@
             <field>fgs.DS.first.text</field>
             <value>Full Text</value>
         </term>
-    </search_terms>    
+    </search_terms>
 </collection_policy>

collection_policies/book_collection_policy.xml

@@ -1,69 +1,70 @@
+
 <collection_policy>
   <!---we will define allowed mimetypes and what to do with various types as part of the content model-->
-  <contentmodels>
-    <contentmodel name="Book">
-      <pid_namespace>islandora</pid_namespace>
-      <pid>ilives:bookCModel</pid>
-      <dsid>ISLANDORACM</dsid>
-    </contentmodel>
-  </contentmodels>
+    <contentmodels>
+        <contentmodel name="Book">
+            <pid_namespace>islandora</pid_namespace>
+            <pid>ilives:bookCModel</pid>
+            <dsid>ISLANDORACM</dsid>
+        </contentmodel>
+    </contentmodels>
   <!--if we define a query for an object the relationship we ask for may not be isMemberOfCollection.  So when we ingest in th
     Collection we will want the relationship to match the query. If this element is null we will use the isMemberOfCollection relationship-->
-  <relationship>isMemberOfCollection</relationship>
-  <search_terms>
+    <relationship>isMemberOfCollection</relationship>
+    <search_terms>
     <!--define what fields we can query as part of the advanced search for this collection-->
-    <default>dc.description</default>
-    <term>
-      <field>dc.title</field>
-      <value>dc.title</value>
-    </term>
-    <term>
-      <field>dc.creator</field>
-      <value>dc.creator</value>
-    </term>
-    <term>
-      <field>dc.description</field>
-      <value>dc.description</value>
-    </term>
-    <term>
-      <field>dc.date</field>
-      <value>dc.date</value>
-    </term>
-    <term>
-      <field>dc.identifier</field>
-      <value>dc.identifier</value>
-    </term>
-    <term>
-      <field>dc.language</field>
-      <value>dc.language</value>
-    </term>
-    <term>
-      <field>dc.publisher</field>
-      <value>dc.publisher</value>
-    </term>
-    <term>
-      <field>dc.rights</field>
-      <value>dc.rights</value>
-    </term>
-    <term>
-      <field>dc.subject</field>
-      <value>dc.subject</value>
-    </term>
-    <term>
-      <field>dc.relation</field>
-      <value>dc.relation</value>
-    </term>
-    <term>
-      <field>dcterms.temporal</field>
-      <value>dcterms.temporal</value>
-    </term>
-    <term>
-      <field>dcterms.spatial</field>
-      <value>dcterms.spatial</value>
-    </term>
-    <term>
-      <field>fgs.DS.first.text</field>
-      <value>Full Text</value>
-    </term>
-  </search_terms>
+        <default>dc.description</default>
+        <term>
+            <field>dc.title</field>
+            <value>dc.title</value>
+        </term>
+        <term>
+            <field>dc.creator</field>
+            <value>dc.creator</value>
+        </term>
+        <term>
+            <field>dc.description</field>
+            <value>dc.description</value>
+        </term>
+        <term>
+            <field>dc.date</field>
+            <value>dc.date</value>
+        </term>
+        <term>
+            <field>dc.identifier</field>
+            <value>dc.identifier</value>
+        </term>
+        <term>
+            <field>dc.language</field>
+            <value>dc.language</value>
+        </term>
+        <term>
+            <field>dc.publisher</field>
+            <value>dc.publisher</value>
+        </term>
+        <term>
+            <field>dc.rights</field>
+            <value>dc.rights</value>
+        </term>
+        <term>
+            <field>dc.subject</field>
+            <value>dc.subject</value>
+        </term>
+        <term>
+            <field>dc.relation</field>
+            <value>dc.relation</value>
+        </term>
+        <term>
+            <field>dcterms.temporal</field>
+            <value>dcterms.temporal</value>
+        </term>
+        <term>
+            <field>dcterms.spatial</field>
+            <value>dcterms.spatial</value>
+        </term>
+        <term>
+            <field>fgs.DS.first.text</field>
+            <value>Full Text</value>
+        </term>
+    </search_terms>
 </collection_policy>

collection_policies/large_image_collection_policy.xml

@@ -6,79 +6,79 @@
         Purpose of the document follows.
 -->
 <collection_policy>
-  <contentmodels>
-    <contentmodel name="SLIDE_CMODEL">
-      <pid_namespace>islandora:slide</pid_namespace>
-      <pid>islandora:slideCModel</pid>
-      <dsid>ISLANDORACM</dsid>
-    </contentmodel>
-    <contentmodel name="MAP_CMODEL">
-      <pid_namespace>islandora:map</pid_namespace>
-      <pid>islandora:mapCModel</pid>
-      <dsid>ISLANDORACM</dsid>
-    </contentmodel>
-    <contentmodel name="HERB_CMODEL">
-      <pid_namespace>islandora:herb</pid_namespace>
-      <pid>islandora:herbCModel</pid>
-      <dsid>ISLANDORACM</dsid>
-    </contentmodel>
-  </contentmodels>
+    <contentmodels>
+        <contentmodel name="SLIDE_CMODEL">
+            <pid_namespace>islandora:slide</pid_namespace>
+            <pid>islandora:slideCModel</pid>
+            <dsid>ISLANDORACM</dsid>
+        </contentmodel>
+        <contentmodel name="MAP_CMODEL">
+            <pid_namespace>islandora:map</pid_namespace>
+            <pid>islandora:mapCModel</pid>
+            <dsid>ISLANDORACM</dsid>
+        </contentmodel>
+        <contentmodel name="HERB_CMODEL">
+            <pid_namespace>islandora:herb</pid_namespace>
+            <pid>islandora:herbCModel</pid>
+            <dsid>ISLANDORACM</dsid>
+        </contentmodel>
+    </contentmodels>
   <!--if we define a query for an object the relationship we ask for may not be isMemberOfCollection.  So when we ingest in th
     Collection we will want the relationship to match the query.-->
-  <relationship>isMemberOfCollection</relationship>
-  <search_terms>
-    <default>dc.description</default>
-    <term>
-      <field>dc.title</field>
-      <value>dc.title</value>
-    </term>
-    <term>
-      <field>dc.creator</field>
-      <value>dc.creator</value>
-    </term>
-    <term>
-      <field>dc.description</field>
-      <value>dc.description</value>
-    </term>
-    <term>
-      <field>dc.date</field>
-      <value>dc.date</value>
-    </term>
-    <term>
-      <field>dc.identifier</field>
-      <value>dc.identifier</value>
-    </term>
-    <term>
-      <field>dc.language</field>
-      <value>dc.language</value>
-    </term>
-    <term>
-      <field>dc.publisher</field>
-      <value>dc.publisher</value>
-    </term>
-    <term>
-      <field>dc.rights</field>
-      <value>dc.rights</value>
-    </term>
-    <term>
-      <field>dc.subject</field>
-      <value>dc.subject</value>
-    </term>
-    <term>
-      <field>dc.relation</field>
-      <value>dc.relation</value>
-    </term>
-    <term>
-      <field>dcterms.temporal</field>
-      <value>dcterms.temporal</value>
-    </term>
-    <term>
-      <field>dcterms.spatial</field>
-      <value>dcterms.spatial</value>
-    </term>
-    <term>
-      <field>fgs.DS.first.text</field>
-      <value>Full Text</value>
-    </term>
-  </search_terms>
+    <relationship>isMemberOfCollection</relationship>
+    <search_terms>
+        <default>dc.description</default>
+        <term>
+            <field>dc.title</field>
+            <value>dc.title</value>
+        </term>
+        <term>
+            <field>dc.creator</field>
+            <value>dc.creator</value>
+        </term>
+        <term>
+            <field>dc.description</field>
+            <value>dc.description</value>
+        </term>
+        <term>
+            <field>dc.date</field>
+            <value>dc.date</value>
+        </term>
+        <term>
+            <field>dc.identifier</field>
+            <value>dc.identifier</value>
+        </term>
+        <term>
+            <field>dc.language</field>
+            <value>dc.language</value>
+        </term>
+        <term>
+            <field>dc.publisher</field>
+            <value>dc.publisher</value>
+        </term>
+        <term>
+            <field>dc.rights</field>
+            <value>dc.rights</value>
+        </term>
+        <term>
+            <field>dc.subject</field>
+            <value>dc.subject</value>
+        </term>
+        <term>
+            <field>dc.relation</field>
+            <value>dc.relation</value>
+        </term>
+        <term>
+            <field>dcterms.temporal</field>
+            <value>dcterms.temporal</value>
+        </term>
+        <term>
+            <field>dcterms.spatial</field>
+            <value>dcterms.spatial</value>
+        </term>
+        <term>
+            <field>fgs.DS.first.text</field>
+            <value>Full Text</value>
+        </term>
+    </search_terms>
 </collection_policy>

collection_policies/qt_collection_policy.xml

@@ -1,35 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
- <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
- <content_models>
- <content_model name="Video" dsid="ISLANDORACM" namespace="islandora" pid="islandora:qtCModel"/>
- </content_models>
- <search_terms>
- <term field="dc.title">
-dc.title</term>
- <term field="dc.creator">
-dc.creator</term>
- <term field="dc.description" default="true">
-dc.description</term>
- <term field="dc.date">
-dc.date</term>
- <term field="dc.identifier">
-dc.identifier</term>
- <term field="dc.language">
-dc.language</term>
- <term field="dc.publisher">
-dc.publisher</term>
- <term field="dc.rights">
-dc.rights</term>
- <term field="dc.subject">
-dc.subject</term>
- <term field="dc.relation">
-dc.relation</term>
- <term field="dcterms.temporal">
-dcterms.temporal</term>
- <term field="dcterms.spatial">
-dcterms.spatial</term>
- </search_terms>
- <relationship>
-isMemberOfCollection</relationship>
- </collection_policy>
+<collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
+    <content_models>
+        <content_model name="Video" dsid="ISLANDORACM" namespace="islandora" pid="islandora:qtCModel"/>
+    </content_models>
+    <search_terms>
+        <term field="dc.title">
+dc.title
+        </term>
+        <term field="dc.creator">
+dc.creator
+        </term>
+        <term field="dc.description" default="true">
+dc.description
+        </term>
+        <term field="dc.date">
+dc.date
+        </term>
+        <term field="dc.identifier">
+dc.identifier
+        </term>
+        <term field="dc.language">
+dc.language
+        </term>
+        <term field="dc.publisher">
+dc.publisher
+        </term>
+        <term field="dc.rights">
+dc.rights
+        </term>
+        <term field="dc.subject">
+dc.subject
+        </term>
+        <term field="dc.relation">
+dc.relation
+        </term>
+        <term field="dcterms.temporal">
+dcterms.temporal
+        </term>
+        <term field="dcterms.spatial">
+dcterms.spatial
+        </term>
+    </search_terms>
+    <relationship>
+isMemberOfCollection
+    </relationship>
+</collection_policy>
 

collection_policy.xsd

@@ -1,47 +1,48 @@
+
 <xsd:schema xmlns="http://www.islandora.ca" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.islandora.ca" elementFormDefault="qualified" >
-  <xsd:annotation>
-    <xsd:documentation xml:lang="en">
+    <xsd:annotation>
+        <xsd:documentation xml:lang="en">
       Islandora Collection Policy Schema
       Islandora, Robertson Library, University of Prince Edward Island, 550 University Ave., Charlottetown, Prince Edward Island
-    </xsd:documentation>
-  </xsd:annotation>
+        </xsd:documentation>
+    </xsd:annotation>
   
-  <xsd:element name="collection_policy" type="collection_policyType"/>
-  <xsd:complexType name="collection_policyType">
-    <xsd:all>
-      <xsd:element name="content_models" type="content_modelsType"/>
-      <xsd:element name="search_terms" type="search_termsType"/>
-      <xsd:element name="relationship" type="xsd:string"/>
-      <xsd:element name="staging_area" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-    </xsd:all>
-    <xsd:attribute name="name" type="xsd:normalizedString" use="required"/>
-  </xsd:complexType>
+    <xsd:element name="collection_policy" type="collection_policyType"/>
+    <xsd:complexType name="collection_policyType">
+        <xsd:all>
+            <xsd:element name="content_models" type="content_modelsType"/>
+            <xsd:element name="search_terms" type="search_termsType"/>
+            <xsd:element name="relationship" type="xsd:string"/>
+            <xsd:element name="staging_area" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+        </xsd:all>
+        <xsd:attribute name="name" type="xsd:normalizedString" use="required"/>
+    </xsd:complexType>
   
-  <xsd:complexType name="content_modelsType">
-    <xsd:sequence>
-      <xsd:element name="content_model" type="content_modelType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
+    <xsd:complexType name="content_modelsType">
+        <xsd:sequence>
+            <xsd:element name="content_model" type="content_modelType" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
   
-  <xsd:complexType name="content_modelType">
-    <xsd:attribute name="name" type="xsd:normalizedString" use="required"/>
-    <xsd:attribute name="dsid" type="xsd:normalizedString" use="required"/>
-    <xsd:attribute name="namespace" type="xsd:normalizedString" use="required"/>
-    <xsd:attribute name="pid" type="xsd:normalizedString" use="required"/>
-  </xsd:complexType>
+    <xsd:complexType name="content_modelType">
+        <xsd:attribute name="name" type="xsd:normalizedString" use="required"/>
+        <xsd:attribute name="dsid" type="xsd:normalizedString" use="required"/>
+        <xsd:attribute name="namespace" type="xsd:normalizedString" use="required"/>
+        <xsd:attribute name="pid" type="xsd:normalizedString" use="required"/>
+    </xsd:complexType>
   
-  <xsd:complexType name="search_termsType">
-    <xsd:sequence>
-      <xsd:element name="term" type="termType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
+    <xsd:complexType name="search_termsType">
+        <xsd:sequence>
+            <xsd:element name="term" type="termType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
   
-  <xsd:complexType name="termType">
-  	<xsd:simpleContent>
-		<xsd:extension base="xsd:string">
-			<xsd:attribute name="field" type="xsd:string" use="optional"/>
-			<xsd:attribute name="default" type="xsd:boolean" default="false"/>
-		</xsd:extension>
-	</xsd:simpleContent>
-  </xsd:complexType>
+    <xsd:complexType name="termType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="field" type="xsd:string" use="optional"/>
+                <xsd:attribute name="default" type="xsd:boolean" default="false"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
 </xsd:schema>

collection_views/COLLECTION_VIEW.xml

@@ -1,264 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" version="1.0">
  <!-- Red and White XSLT -->
-  <xsl:variable name="BASEURL">
-    <xsl:value-of select="$baseUrl"/>
-  </xsl:variable>
-  <xsl:variable name="PATH">
-    <xsl:value-of select="$path"/>
-  </xsl:variable>
-  <xsl:variable name="thisPid" select="$collectionPid"/>
-  <xsl:variable name="thisTitle" select="$collectionTitle"/>
-  <xsl:variable name="size"  select="20"/>
-  <xsl:variable name="page" select="$hitPage"/>
-  <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
-  <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/>
-  <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
-  <xsl:template match="/">
-    <xsl:if test="$count>0">
-      <table cellpadding="3" cellspacing="3">
-        <tr>
-          <td colspan="{$cellsPerRow}">
-            <div align="center">
-              <xsl:choose>
-                <xsl:when test="$end >= $count and $start = 1">
-                  <xsl:value-of select="$start"/>-
-                  <xsl:value-of select="$count"/>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div align="center">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
      of 
-                  <xsl:value-of select="$count"/>&#160;
-                  <br />
-                </xsl:when>
-                <xsl:when test="$end >= $count">
-                  <xsl:value-of select="$start"/>-
-                  <xsl:value-of select="$count"/>
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
      of 
-                  <xsl:value-of select="$count"/>&#160;
-                  <br />
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                      <xsl:value-of select="$thisPid"/>/-/
-                      <xsl:value-of select="$thisTitle"/>/
-                      <xsl:value-of select="$page - 1"/>
-                    </xsl:attribute>
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-                  </a>
-                </xsl:when>
-                <xsl:when test="$start = 1">
-                  <xsl:value-of select="$start"/>-
-                  <xsl:value-of select="$end"/>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
      of 
-                  <xsl:value-of select="$count"/>&#160;
-                  <br />
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                      <xsl:value-of select="$thisPid"/>/-/
-                      <xsl:value-of select="$thisTitle"/>/
-                      <xsl:value-of select="$page + 1"/>
-                    </xsl:attribute>
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-                  </a>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$start"/>-
-                  <xsl:value-of select="$end"/>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
      of 
-                  <xsl:value-of select="$count"/>&#160;
-                  <br />
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                      <xsl:value-of select="$thisPid"/>/-/
-                      <xsl:value-of select="$thisTitle"/>/
-                      <xsl:value-of select="$page - 1"/>
-                    </xsl:attribute>
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-                  </a>&#160;
-                  <a>
-                    <xsl:attribute name="href">
-                      <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                      <xsl:value-of select="$thisPid"/>/-/
-                      <xsl:value-of select="$thisTitle"/>/
-                      <xsl:value-of select="$page + 1"/>
-                    </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-                  </a>
-                </xsl:otherwise>
-              </xsl:choose>
-            </div>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
+                <xsl:apply-templates select="s:sparql/s:results"/>
+            </table>
             <br clear="all" />
-          </td>
-        </tr>
-        <xsl:apply-templates select="s:sparql/s:results"/>
-      </table>
-      <br clear="all" />
-      <div align="center">
-        <xsl:choose>
-          <xsl:when test="$end >= $count and $start = 1">
-            <xsl:value-of select="$start"/>-
-            <xsl:value-of select="$count"/>
+            <div align="center">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
    of 
-            <xsl:value-of select="$count"/>&#160;
-            <br />
-          </xsl:when>
-          <xsl:when test="$end >= $count">
-            <xsl:value-of select="$start"/>-
-            <xsl:value-of select="$count"/>
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
    of 
-            <xsl:value-of select="$count"/>&#160;
-            <br />
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                <xsl:value-of select="$thisPid"/>/-/
-                <xsl:value-of select="$thisTitle"/>/
-                <xsl:value-of select="$page - 1"/>
-              </xsl:attribute>
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-            </a>
-          </xsl:when>
-          <xsl:when test="$start = 1">
-            <xsl:value-of select="$start"/>-
-            <xsl:value-of select="$end"/>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
    of 
-            <xsl:value-of select="$count"/>&#160;
-            <br />
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                <xsl:value-of select="$thisPid"/>/-/
-                <xsl:value-of select="$thisTitle"/>/
-                <xsl:value-of select="$page + 1"/>
-              </xsl:attribute>
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$start"/>-
-            <xsl:value-of select="$end"/>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
    of 
-            <xsl:value-of select="$count"/>&#160;
-            <br />
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                <xsl:value-of select="$thisPid"/>/-/
-                <xsl:value-of select="$thisTitle"/>/
-                <xsl:value-of select="$page - 1"/>
-              </xsl:attribute>
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-            </a>&#160;
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$BASEURL"/>/fedora/repository/
-                <xsl:value-of select="$thisPid"/>/-/
-                <xsl:value-of select="$thisTitle"/>/
-                <xsl:value-of select="$page + 1"/>
-              </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </div>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="s:sparql/s:results">
-    <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-      <tr>
-        <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
-      </tr>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template match="s:result">
-    <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
-    <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-    <xsl:variable name="newTitle" >
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="s:title"/>
-        <xsl:with-param name="from" select="'_'"/>
-        <xsl:with-param name="to" select="' '"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="linkUrl">
-      <xsl:choose>
-        <xsl:when test="(content='Collection' or content='Community')">
-          <xsl:value-of select="$BASEURL"/>/fedora/repository/
-          <xsl:copy-of select="$PID"/>/-/
-          <xsl:value-of select="s:title"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$BASEURL"/>/fedora/repository/
-          <xsl:copy-of select="$PID"/>/
-          <xsl:value-of select="s:title"/>/
-          <xsl:value-of select="s:title"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <td valign="top" width="25%">
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="s:sparql/s:results">
+        <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="s:result">
+        <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="s:title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="s:title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/
+                    <xsl:value-of select="s:title"/>/
+                    <xsl:value-of select="s:title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
    
-      <img>
-        <xsl:attribute name="src">
-          <xsl:value-of select="$BASEURL"/>/fedora/repository/
-          <xsl:value-of select="$PID"/>/TN
-        </xsl:attribute>
-      </img>
-      <br clear="all" />
+            <img>
+                <xsl:attribute name="src">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:value-of select="$PID"/>/TN
+                </xsl:attribute>
+            </img>
+            <br clear="all" />
    
     
-      <xsl:value-of select="$newTitle"/>
+            <xsl:value-of select="$newTitle"/>
   
-      <xsl:if test="($CONTENTMODEL!='islandora:collectionCModel')">
-        <br />--
-        <a>
-          <xsl:attribute name="href">
-            <xsl:value-of select="$BASEURL"/>/fedora/repository/
-            <xsl:copy-of select="$PID"/>/-/
-            <xsl:value-of select="s:title"/>
-          </xsl:attribute>
+            <xsl:if test="($CONTENTMODEL!='islandora:collectionCModel')">
+                <br />--
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:copy-of select="$PID"/>/-/
+                        <xsl:value-of select="s:title"/>
+                    </xsl:attribute>
     DETAILS
-        </a>--
-      </xsl:if>
-    </td>
-    <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-      <xsl:call-template name="FillerCells">
-        <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="FillerCells">
-    <xsl:param name="cellCount"/>
-    <td>&#160;</td>
-    <xsl:if test="$cellCount > 1">
-      <xsl:call-template name="FillerCells">
-        <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="replace-string">
-    <xsl:param name="text"/>
-    <xsl:param name="from"/>
-    <xsl:param name="to"/>
+                </a>--
+            </xsl:if>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
   
-    <xsl:choose>
-      <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
     
-        <xsl:variable name="before" select="substring-before($text, $from)"/>
-        <xsl:variable name="after" select="substring-after($text, $from)"/>
-        <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
     
-        <xsl:value-of select="$before"/>
-        <xsl:value-of select="$to"/>
-        <xsl:call-template name="replace-string">
-          <xsl:with-param name="text" select="$after"/>
-          <xsl:with-param name="from" select="$from"/>
-          <xsl:with-param name="to" select="$to"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$text"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/Coverflow_Collection_View.xsl

@@ -1,59 +1,61 @@
+
 <xsl:stylesheet exclude-result-prefixes="php" version="1.0" xmlns:php="http://php.net/xsl"
   xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>
-    <xsl:variable name="PATH">
-      <xsl:value-of select="$path"/>
-    </xsl:variable>
-    <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
-    <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
-    <script src="http://yui.yahooapis.com/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/animation/animation-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/element/element-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/container/container_core-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/menu/menu-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/button/button-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script type="text/javascript">
-      <xsl:attribute name="src">
-        <xsl:value-of select="$PATH"/>
-        <xsl:text>/collection_views/yui_coverflow/js/CoverFlow.js</xsl:text>
-      </xsl:attribute>
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script type="text/javascript">
-      <xsl:text>
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
+        <xsl:variable name="PATH">
+            <xsl:value-of select="$path"/>
+        </xsl:variable>
+        <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
+        <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
+        <script src="http://yui.yahooapis.com/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/animation/animation-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/element/element-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/container/container_core-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/menu/menu-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/button/button-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script type="text/javascript">
+            <xsl:attribute name="src">
+                <xsl:value-of select="$PATH"/>
+                <xsl:text>/collection_views/yui_coverflow/js/CoverFlow.js</xsl:text>
+            </xsl:attribute>
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script type="text/javascript">
+            <xsl:text>
                 
                // YAHOO.util.Event.onDOMReady(function(){
                 //$(document).ready(function(){
                 window.onload = function(){
-                var images = [</xsl:text>
-      <xsl:for-each select="/s:sparql/s:results/s:result">
-        <xsl:variable name="OBJECTURI" select="s:object/@uri"/>
-        <xsl:variable name="pid" select="substring-after($OBJECTURI,'/')"/>
-        <xsl:text>{src: '</xsl:text>
-        <xsl:value-of select="$BASEURL"/>
-        <xsl:text>/fedora/repository/</xsl:text>
-        <xsl:value-of select="$pid"/>
-        <xsl:text>/TN', label: '</xsl:text>
-        <xsl:value-of select="s:memberTitle"/>
-        <xsl:text>', onclick: function(){alert('image1');}},
+                var images = [
+            </xsl:text>
+            <xsl:for-each select="/s:sparql/s:results/s:result">
+                <xsl:variable name="OBJECTURI" select="s:object/@uri"/>
+                <xsl:variable name="pid" select="substring-after($OBJECTURI,'/')"/>
+                <xsl:text>{src: '</xsl:text>
+                <xsl:value-of select="$BASEURL"/>
+                <xsl:text>/fedora/repository/</xsl:text>
+                <xsl:value-of select="$pid"/>
+                <xsl:text>/TN', label: '</xsl:text>
+                <xsl:value-of select="s:memberTitle"/>
+                <xsl:text>', onclick: function(){alert('image1');}},
                 </xsl:text>
-      </xsl:for-each>
-      <xsl:text>
+            </xsl:for-each>
+            <xsl:text>
                 ];
                 
                 var myCoverFlow = new YAHOO.ext.CoverFlow('coverFlowTest', {height: 200, width: 600, images: images});
@@ -67,13 +69,14 @@
                 var myMoveLeftBtn = new YAHOO.widget.Button('moveLeftButton', {onclick: {fn: moveLeft, obj: myCoverFlow}});
                 var myMoveRightBtn = new YAHOO.widget.Button('moveRightButton', {onclick: {fn: moveRight, obj: myCoverFlow}});
                 
-                };</xsl:text>
-    </script>
-    <div class="title">Testing YUI's CoverFlow version 0.1 (beta)</div>
-    <div id="coverFlowTest"/>
-    <input id="moveLeftButton" type="button" value="Select Next"/>
-    <input id="moveRightButton" type="button" value="Select Previous"/>
-    <br/>
-    <br/>
-  </xsl:template>
+                };
+            </xsl:text>
+        </script>
+        <div class="title">Testing YUI's CoverFlow version 0.1 (beta)</div>
+        <div id="coverFlowTest"/>
+        <input id="moveLeftButton" type="button" value="Select Next"/>
+        <input id="moveRightButton" type="button" value="Select Previous"/>
+        <br/>
+        <br/>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/Coverflow_PRE_Collection_View.xsl

@@ -1,63 +1,65 @@
+
 <xsl:stylesheet exclude-result-prefixes="php" version="1.0" xmlns:php="http://php.net/xsl"
   xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>
-    <xsl:variable name="PATH">
-      <xsl:value-of select="$path"/>
-    </xsl:variable>
-    <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
-    <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
-    <script src="http://yui.yahooapis.com/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/animation/animation-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/element/element-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/container/container_core-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/menu/menu-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script src="http://yui.yahooapis.com/2.7.0/build/button/button-min.js" type="text/javascript">
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script type="text/javascript">
-      <xsl:attribute name="src">
-        <xsl:value-of select="$PATH"/>
-        <xsl:text>/collection_views/yui_coverflow/js/CoverFlow.js</xsl:text>
-      </xsl:attribute>
-      <xsl:comment>Comment added so script is recognised</xsl:comment>
-    </script>
-    <script type="text/javascript">
-      <xsl:text>
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
+        <xsl:variable name="PATH">
+            <xsl:value-of select="$path"/>
+        </xsl:variable>
+        <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
+        <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
+        <script src="http://yui.yahooapis.com/2.7.0/build/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/animation/animation-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/element/element-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/container/container_core-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/menu/menu-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script src="http://yui.yahooapis.com/2.7.0/build/button/button-min.js" type="text/javascript">
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script type="text/javascript">
+            <xsl:attribute name="src">
+                <xsl:value-of select="$PATH"/>
+                <xsl:text>/collection_views/yui_coverflow/js/CoverFlow.js</xsl:text>
+            </xsl:attribute>
+            <xsl:comment>Comment added so script is recognised</xsl:comment>
+        </script>
+        <script type="text/javascript">
+            <xsl:text>
                 
                // YAHOO.util.Event.onDOMReady(function(){
                 //$(document).ready(function(){
                 window.onload = function(){
-                var images = [</xsl:text>
-      <xsl:for-each select="/s:sparql/s:results/s:result">
-        <xsl:variable name="OBJECTURI" select="s:object/@uri"/>
-        <xsl:variable name="pid" select="substring-after($OBJECTURI,'/')"/>
-        <xsl:text>{src: '</xsl:text>
-        <xsl:value-of select="$BASEURL"/>
-        <xsl:text>/fedora/repository/</xsl:text>
-        <xsl:value-of select="$pid"/>
-        <xsl:text>/PRE', label: '</xsl:text>
-        <xsl:value-of select="s:memberTitle"/>
-        <xsl:text>', onclick: function(){ window.location='</xsl:text>
-        <xsl:value-of select="$BASEURL" />
-        <xsl:text>/fedora/repository/</xsl:text>
-        <xsl:value-of select="$pid"/>
-        <xsl:text>';}},
-        </xsl:text>
-      </xsl:for-each>
-      <xsl:text>
+                var images = [
+            </xsl:text>
+            <xsl:for-each select="/s:sparql/s:results/s:result">
+                <xsl:variable name="OBJECTURI" select="s:object/@uri"/>
+                <xsl:variable name="pid" select="substring-after($OBJECTURI,'/')"/>
+                <xsl:text>{src: '</xsl:text>
+                <xsl:value-of select="$BASEURL"/>
+                <xsl:text>/fedora/repository/</xsl:text>
+                <xsl:value-of select="$pid"/>
+                <xsl:text>/PRE', label: '</xsl:text>
+                <xsl:value-of select="s:memberTitle"/>
+                <xsl:text>', onclick: function(){ window.location='</xsl:text>
+                <xsl:value-of select="$BASEURL" />
+                <xsl:text>/fedora/repository/</xsl:text>
+                <xsl:value-of select="$pid"/>
+                <xsl:text>';}},
+                </xsl:text>
+            </xsl:for-each>
+            <xsl:text>
                 ];
                 
                 var myCoverFlow = new YAHOO.ext.CoverFlow('coverFlowTest', {height: 300, width: 650, images: images});
@@ -71,13 +73,14 @@
                 var myMoveLeftBtn = new YAHOO.widget.Button('moveLeftButton', {onclick: {fn: moveLeft, obj: myCoverFlow}});
                 var myMoveRightBtn = new YAHOO.widget.Button('moveRightButton', {onclick: {fn: moveRight, obj: myCoverFlow}});
                 
-                };</xsl:text>
-    </script>
-    <div class="title">Testing YUI's CoverFlow version 0.1 (beta)</div>
-    <div id="coverFlowTest"/>
-    <input id="moveLeftButton" type="button" value="Select Next"/>
-    <input id="moveRightButton" type="button" value="Select Previous"/>
-    <br/>
-    <br/>
-  </xsl:template>
+                };
+            </xsl:text>
+        </script>
+        <div class="title">Testing YUI's CoverFlow version 0.1 (beta)</div>
+        <div id="coverFlowTest"/>
+        <input id="moveLeftButton" type="button" value="Select Next"/>
+        <input id="moveRightButton" type="button" value="Select Previous"/>
+        <br/>
+        <br/>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/FLV-COLLECTION VIEW(2).xml

@@ -1,65 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">
-<table cellpadding="3" cellspacing="3" width="90%">
- <tr><td colspan="{$cellsPerRow}">
-  <div STYLE="text-align: center;">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3" width="90%">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div STYLE="text-align: center;">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when>
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  <br clear="all" />
- </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
 
   <!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
   <xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -79,134 +110,176 @@
    </tr>
   </xsl:for-each>-
  -->
- <xsl:apply-templates select="sparql/results"/>
-</table><br clear="all" />
-<div STYLE="text-align: center;">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                <xsl:apply-templates select="sparql/results"/>
+            </table>
+            <br clear="all" />
+            <div STYLE="text-align: center;">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when>
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
- <xsl:template match="sparql/results">
-   <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-    <tr>
-     <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
-    </tr>
-   </xsl:for-each>
- </xsl:template>
- <xsl:template match="result">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-  <xsl:call-template name="replace-string">
-   <xsl:with-param name="text" select="title"/>
-   <xsl:with-param name="from" select="'_'"/>
-   <xsl:with-param name="to" select="' '"/>
-  </xsl:call-template>
-   </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="(content='Collection' or content='Community')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="title"/>
-     </xsl:otherwise>
-   </xsl:choose>
-  </xsl:variable>
-  <td valign="top" width="25%">
-   <a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>    
-   <img>
-    <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-    </xsl:attribute>
-	<xsl:attribute name="alt"><xsl:value-of select="$newTitle"/>
-    </xsl:attribute>
-   </img> </a>  <br clear="all" />
-   <a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="sparql/results">
+        <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="result">
+        <xsl:variable name='OBJECTURI' select="object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/OBJ/
+                    <xsl:value-of select="title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:attribute>
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:value-of select="$PID"/>/TN
+                    </xsl:attribute>
+                    <xsl:attribute name="alt">
+                        <xsl:value-of select="$newTitle"/>
+                    </xsl:attribute>
+                </img>
+            </a>
+            <br clear="all" />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
 
-   </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
 
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
 
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
 
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/REFWORKS-COLLECTION_VIEW.xml

@@ -1,65 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
- <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
- <xsl:template match="/">
-  <xsl:if test="$count>0">
-   <table cellpadding="3" cellspacing="3" width="90%">
-    <tr><td colspan="{$cellsPerRow}">
-     <div STYLE="text-align: center;">
-      <xsl:choose>
-       <xsl:when test="$end >= $count and $start = 1">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-       </xsl:when>
-       <xsl:when test="$end >= $count">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-         </xsl:attribute>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3" width="90%">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div STYLE="text-align: center;">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
          &lt;&lt;Prev
-        </a>
-       </xsl:when>
-       <xsl:when test="$start = 1">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-         </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
          Next>>
-        </a>
-       </xsl:when>
-       <xsl:otherwise>
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-         </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
          &lt;&lt;Prev
-        </a>&#160;
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-         </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
          Next>>
-        </a>
-       </xsl:otherwise>
-      </xsl:choose>
-     </div>  <br clear="all" />
-    </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
     
     <!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
      <xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -79,81 +110,114 @@
      </tr>
      </xsl:for-each>-
     -->
-    <xsl:apply-templates select="s:sparql/s:results"/>
-   </table><br clear="all" />
-   <div STYLE="text-align: center;">
-    <xsl:choose>
-     <xsl:when test="$end >= $count and $start = 1">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-     </xsl:when>
-     <xsl:when test="$end >= $count">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-       </xsl:attribute>
+                <xsl:apply-templates select="s:sparql/s:results"/>
+            </table>
+            <br clear="all" />
+            <div STYLE="text-align: center;">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
        &lt;&lt;Prev
-      </a>
-     </xsl:when>
-     <xsl:when test="$start = 1">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-       </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
        Next>>
-      </a>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-       </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
        &lt;&lt;Prev
-      </a>&#160;
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-       </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
        Next>>
-      </a>
-     </xsl:otherwise>
-    </xsl:choose>
-   </div>
-  </xsl:if>
- </xsl:template>
- <xsl:template match="s:sparql/s:results">
-  <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-   <tr>
-    <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
-   </tr>
-  </xsl:for-each>
- </xsl:template>
- <xsl:template match="s:result">
-  <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
-  <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
-  <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="text" select="s:title"/>
-    <xsl:with-param name="from" select="'_'"/>
-    <xsl:with-param name="to" select="' '"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="s:title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="s:title"/>
-    </xsl:otherwise>
-   </xsl:choose>
-   <xsl:value-of select="s:content"/>
-  </xsl:variable>
-  <td valign="top" width="25%">
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="s:sparql/s:results">
+        <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="s:result">
+        <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
+        <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
+        <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="s:title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="s:title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/OBJ/
+                    <xsl:value-of select="s:title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:value-of select="s:content"/>
+        </xsl:variable>
+        <td valign="top" width="25%">
  <!--  <a>
     <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
     </xsl:attribute>
@@ -164,52 +228,55 @@
      </xsl:attribute>
     </img> </a>  <br clear="all" />-->
    
-   <br /><a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="s:title"/>
-    </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
+            <br />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="s:title"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
    
-  </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
   
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
     
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
     
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/SIMPLE-COLLECTION_VIEW.xml

@@ -1,65 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
- <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
- <xsl:template match="/">
-  <xsl:if test="$count>0">
-   <table cellpadding="3" cellspacing="3" width="90%">
-    <tr><td colspan="{$cellsPerRow}">
-     <div STYLE="text-align: center;">
-      <xsl:choose>
-       <xsl:when test="$end >= $count and $start = 1">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-       </xsl:when>
-       <xsl:when test="$end >= $count">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-         </xsl:attribute>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(s:sparql/s:results/s:result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3" width="90%">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div STYLE="text-align: center;">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
          &lt;&lt;Prev
-        </a>
-       </xsl:when>
-       <xsl:when test="$start = 1">
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-         </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
          Next>>
-        </a>
-       </xsl:when>
-       <xsl:otherwise>
-        <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-        of <xsl:value-of select="$count"/>&#160;<br />
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-         </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+        of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
          &lt;&lt;Prev
-        </a>&#160;
-        <a>
-         <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-         </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
          Next>>
-        </a>
-       </xsl:otherwise>
-      </xsl:choose>
-     </div>  <br clear="all" />
-    </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
     
     <!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
      <xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -79,137 +110,179 @@
      </tr>
      </xsl:for-each>-
     -->
-    <xsl:apply-templates select="s:sparql/s:results"/>
-   </table><br clear="all" />
-   <div STYLE="text-align: center;">
-    <xsl:choose>
-     <xsl:when test="$end >= $count and $start = 1">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-     </xsl:when>
-     <xsl:when test="$end >= $count">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-       </xsl:attribute>
+                <xsl:apply-templates select="s:sparql/s:results"/>
+            </table>
+            <br clear="all" />
+            <div STYLE="text-align: center;">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
        &lt;&lt;Prev
-      </a>
-     </xsl:when>
-     <xsl:when test="$start = 1">
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-       </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
        Next>>
-      </a>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-      of <xsl:value-of select="$count"/>&#160;<br />
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-       </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+      of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
        &lt;&lt;Prev
-      </a>&#160;
-      <a>
-       <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-       </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
        Next>>
-      </a>
-     </xsl:otherwise>
-    </xsl:choose>
-   </div>
-  </xsl:if>
- </xsl:template>
- <xsl:template match="s:sparql/s:results">
-  <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-   <tr>
-    <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
-   </tr>
-  </xsl:for-each>
- </xsl:template>
- <xsl:template match="s:result">
-  <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
-  <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
-  <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="text" select="s:title"/>
-    <xsl:with-param name="from" select="'_'"/>
-    <xsl:with-param name="to" select="' '"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="s:title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="s:title"/>
-    </xsl:otherwise>
-   </xsl:choose>
-   <xsl:value-of select="s:content"/>
-  </xsl:variable>
-  <td valign="top" width="25%">
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
-    </xsl:attribute>
-    <img>
-     <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-     </xsl:attribute>
-     <xsl:attribute name="alt"><xsl:value-of select="$newTitle"/>
-     </xsl:attribute>
-    </img> </a>  <br clear="all" />
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="s:sparql/s:results">
+        <xsl:for-each select="s:result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::s:result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="s:result">
+        <xsl:variable name='OBJECTURI' select="s:object/@uri"/>
+        <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
+        <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="s:title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="s:title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/OBJ/
+                    <xsl:value-of select="s:title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:value-of select="s:content"/>
+        </xsl:variable>
+        <td valign="top" width="25%">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$linkUrl"/>
+                </xsl:attribute>
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:value-of select="$PID"/>/TN
+                    </xsl:attribute>
+                    <xsl:attribute name="alt">
+                        <xsl:value-of select="$newTitle"/>
+                    </xsl:attribute>
+                </img>
+            </a>
+            <br clear="all" />
    
-   <br /><a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="s:title"/>
-    </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
+            <br />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="s:title"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
    
-  </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
   
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
     
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
     
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/SmileyStuff-COLLECTION_VIEW.xml

@@ -1,67 +1,69 @@
+
 <xsl:stylesheet version="1.0" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>
-    <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
-    <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
+        <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
+        <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
 
         <center>
-          <font face="arial,helvetica">
-            <h2>
-              <xsl:value-of select="$collTitle"/>
-              <br/>
-              <i>
-                <xsl:value-of select="$collDesc"/>
-              </i>
-            </h2>
-          </font>
+            <font face="arial,helvetica">
+                <h2>
+                    <xsl:value-of select="$collTitle"/>
+                    <br/>
+                    <i>
+                        <xsl:value-of select="$collDesc"/>
+                    </i>
+                </h2>
+            </font>
         </center>
         <hr size="1"/>
         <center>
-          <table border="0" cellpadding="5">
-            <xsl:for-each select="/s:sparql/s:results/s:result">
-              <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
-              <tr>
-                <td>
-                  <center>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="$BASEURL"/>
-                        <xsl:text>/fedora/repository/</xsl:text>
-                        <xsl:value-of select="$pid"/>
-                        <xsl:text>/FULL_SIZE</xsl:text>
-                      </xsl:attribute>
-                      <img height="120" width="160">
-                        <xsl:attribute name="src">
-                          <xsl:value-of select="$BASEURL"/>
-                          <xsl:text>/fedora/repository/</xsl:text>
-                          <xsl:value-of select="$pid"/>
-                          <xsl:text>/MEDIUM_SIZE</xsl:text>
-                        </xsl:attribute>
-                      </img>
-                      <br/>
+            <table border="0" cellpadding="5">
+                <xsl:for-each select="/s:sparql/s:results/s:result">
+                    <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
+                    <tr>
+                        <td>
+                            <center>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>
+                                        <xsl:text>/FULL_SIZE</xsl:text>
+                                    </xsl:attribute>
+                                    <img height="120" width="160">
+                                        <xsl:attribute name="src">
+                                            <xsl:value-of select="$BASEURL"/>
+                                            <xsl:text>/fedora/repository/</xsl:text>
+                                            <xsl:value-of select="$pid"/>
+                                            <xsl:text>/MEDIUM_SIZE</xsl:text>
+                                        </xsl:attribute>
+                                    </img>
+                                    <br/>
                       ( Full Size )
-                    </a>
-                  </center>
-                </td>
-                <td>
-                  <b>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="$BASEURL"/>
-                        <xsl:text>/fedora/repository/</xsl:text>
-                        <xsl:value-of select="$pid"/>/-/<xsl:value-of select="s:memberTitle"/>
-                      </xsl:attribute>                      
-                    <xsl:value-of select="s:memberTitle"/>
-                      </a>
-                  </b>
-                  <br/>
-                  <xsl:value-of select="s:memberDesc"/>
-                </td>
-              </tr>
-            </xsl:for-each>
-          </table>
+                                </a>
+                            </center>
+                        </td>
+                        <td>
+                            <b>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>/-/
+                                        <xsl:value-of select="s:memberTitle"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="s:memberTitle"/>
+                                </a>
+                            </b>
+                            <br/>
+                            <xsl:value-of select="s:memberDesc"/>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
         </center>
-  </xsl:template>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/Video-COLLECTION_VIEW.xml

@@ -1,64 +1,66 @@
+
 <xsl:stylesheet version="1.0" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>
-    <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
-    <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
+        <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
+        <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
 
         <center>
-          <font face="arial,helvetica">
-            <h2>
-              <xsl:value-of select="$collTitle"/>
-              <br/>
-              <i>
-                <xsl:value-of select="$collDesc"/>
-              </i>
-            </h2>
-          </font>
+            <font face="arial,helvetica">
+                <h2>
+                    <xsl:value-of select="$collTitle"/>
+                    <br/>
+                    <i>
+                        <xsl:value-of select="$collDesc"/>
+                    </i>
+                </h2>
+            </font>
         </center>
         <hr size="1"/>
         <center>
-          <table border="0" cellpadding="5">
-            <xsl:for-each select="/s:sparql/s:results/s:result">
-              <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
-              <tr>
-                <td>
-                  <center>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="$BASEURL"/>
-                        <xsl:text>/fedora/repository/</xsl:text>
-                        <xsl:value-of select="$pid"/>
-                      </xsl:attribute>
-                      <img height="120" width="160">
-                        <xsl:attribute name="src">
-                          <xsl:value-of select="$BASEURL"/>
-                          <xsl:text>/fedora/repository/</xsl:text>
-                          <xsl:value-of select="$pid"/>
-                          <xsl:text>/THUMBNAIL</xsl:text>
-                        </xsl:attribute>
-                      </img>
-                    </a>
-                  </center>
-                </td>
-                <td>
-                  <b>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="$BASEURL"/>
-                        <xsl:text>/fedora/repository/</xsl:text>
-                        <xsl:value-of select="$pid"/>/-/<xsl:value-of select="s:memberTitle"/>
-                      </xsl:attribute>                      
-                    <xsl:value-of select="s:memberTitle"/>
-                      </a>
-                  </b>
-                  <br/>
-                  <xsl:value-of select="s:memberDesc"/>
-                </td>
-              </tr>
-            </xsl:for-each>
-          </table>
+            <table border="0" cellpadding="5">
+                <xsl:for-each select="/s:sparql/s:results/s:result">
+                    <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
+                    <tr>
+                        <td>
+                            <center>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>
+                                    </xsl:attribute>
+                                    <img height="120" width="160">
+                                        <xsl:attribute name="src">
+                                            <xsl:value-of select="$BASEURL"/>
+                                            <xsl:text>/fedora/repository/</xsl:text>
+                                            <xsl:value-of select="$pid"/>
+                                            <xsl:text>/THUMBNAIL</xsl:text>
+                                        </xsl:attribute>
+                                    </img>
+                                </a>
+                            </center>
+                        </td>
+                        <td>
+                            <b>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>/-/
+                                        <xsl:value-of select="s:memberTitle"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="s:memberTitle"/>
+                                </a>
+                            </b>
+                            <br/>
+                            <xsl:value-of select="s:memberDesc"/>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
         </center>
-  </xsl:template>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/default-sparqltoHtml.xsl

@@ -1,124 +1,189 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- DEFAULT XSLT FOR COLLECTIONS THAT DO NOT DEFINE THEIR OWN-->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name='columns' select="4"/>
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name='columns' select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
 
-<table>
- <tr><td colspan="2">
-  <div align="center">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+            <table>
+                <tr>
+                    <td colspan="2">
+                        <div align="center">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when>
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>
- </td></tr>
- <xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <tr>
-   <td>
-    <img>
-     <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-     </xsl:attribute>
-    </img>
-   </td><td>
-    <a>
-     <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
-    <xsl:value-of select="title"/>
-   </a>
-   </td></tr>
- </xsl:for-each>
-</table>
-<div align="center">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                    </td>
+                </tr>
+                <xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
+                    <xsl:variable name='OBJECTURI' select="object/@uri"/>
+                    <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+                    <tr>
+                        <td>
+                            <img>
+                                <xsl:attribute name="src">
+                                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                    <xsl:value-of select="$PID"/>/TN
+                                </xsl:attribute>
+                            </img>
+                        </td>
+                        <td>
+                            <a>
+                                <xsl:attribute name="href">
+                                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                    <xsl:copy-of select="$PID"/>/-/
+                                    <xsl:value-of select="title"/>
+                                </xsl:attribute>
+                                <xsl:value-of select="title"/>
+                            </a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+            <div align="center">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when>
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/demo_image_collection_dc_record.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>Demo Image Collection</dc:title>
-  <dc:identifier>islandora:demo_image_collection</dc:identifier>
-  <dc:description>Demo image collection</dc:description>
+    <dc:title>Demo Image Collection</dc:title>
+    <dc:identifier>islandora:demo_image_collection</dc:identifier>
+    <dc:description>Demo image collection</dc:description>
 </oai_dc:dc>

collection_views/simple_list_view.xml

@@ -1,28 +1,30 @@
+
 <xsl:stylesheet version="1.0" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <!-- simple list view for a itql query that looks queries for $object and $title only -->
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>   
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
 
-         <ul>
+        <ul>
             <xsl:for-each select="/s:sparql/s:results/s:result">
-              <xsl:variable name="pid" select="substring-after(s:object/@uri, '/')"/>
-             <li>
+                <xsl:variable name="pid" select="substring-after(s:object/@uri, '/')"/>
+                <li>
                  
                     <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="$BASEURL"/>
-                        <xsl:text>/fedora/repository/</xsl:text>
-                        <xsl:value-of select="$pid"/>/-/<xsl:value-of select="s:title"/>
-                      </xsl:attribute>                      
-                    <xsl:value-of select="s:title"/>
-                      </a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$BASEURL"/>
+                            <xsl:text>/fedora/repository/</xsl:text>
+                            <xsl:value-of select="$pid"/>/-/
+                            <xsl:value-of select="s:title"/>
+                        </xsl:attribute>
+                        <xsl:value-of select="s:title"/>
+                    </a>
                  
                 
-               </li>
+                </li>
             </xsl:for-each>
-          </ul>
+        </ul>
      
-  </xsl:template>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/standard_jpeg_collection_view.xml

@@ -1,66 +1,68 @@
+
 <xsl:stylesheet version="1.0" xmlns:s="http://www.w3.org/2001/sw/DataAccess/rf1/result" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <xsl:variable name="BASEURL">
-      <xsl:value-of select="$baseUrl"/>
-    </xsl:variable>
-    <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
-    <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
-    <center>
-      <font face="arial,helvetica">
-        <h2>
-          <xsl:value-of select="$collTitle"/>
-          <br/>
-          <i>
-            <xsl:value-of select="$collDesc"/>
-          </i>
-        </h2>
-      </font>
-    </center>
-    <hr size="1"/>
-    <center>
-      <table border="0" cellpadding="5">
-        <xsl:for-each select="/s:sparql/s:results/s:result">
-          <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
-          <tr>
-            <td>
-              <center>
-                <a>
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$BASEURL"/>
-                    <xsl:text>/fedora/repository/</xsl:text>
-                    <xsl:value-of select="$pid"/>
-                    <xsl:text>/FULL_SIZE</xsl:text>
-                  </xsl:attribute>
-                  <img height="120" width="160">
-                    <xsl:attribute name="src">
-                      <xsl:value-of select="$BASEURL"/>
-                      <xsl:text>/fedora/repository/</xsl:text>
-                      <xsl:value-of select="$pid"/>
-                      <xsl:text>/MEDIUM_SIZE</xsl:text>
-                    </xsl:attribute>
-                  </img>
-                  <br/>
+    <xsl:template match="/">
+        <xsl:variable name="BASEURL">
+            <xsl:value-of select="$baseUrl"/>
+        </xsl:variable>
+        <xsl:variable name="collTitle" select="/s:sparql/s:results/s:result/s:collTitle"/>
+        <xsl:variable name="collDesc" select="/s:sparql/s:results/s:result/s:collDesc"/>
+        <center>
+            <font face="arial,helvetica">
+                <h2>
+                    <xsl:value-of select="$collTitle"/>
+                    <br/>
+                    <i>
+                        <xsl:value-of select="$collDesc"/>
+                    </i>
+                </h2>
+            </font>
+        </center>
+        <hr size="1"/>
+        <center>
+            <table border="0" cellpadding="5">
+                <xsl:for-each select="/s:sparql/s:results/s:result">
+                    <xsl:variable name="pid" select="substring-after(s:member/@uri, '/')"/>
+                    <tr>
+                        <td>
+                            <center>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>
+                                        <xsl:text>/FULL_SIZE</xsl:text>
+                                    </xsl:attribute>
+                                    <img height="120" width="160">
+                                        <xsl:attribute name="src">
+                                            <xsl:value-of select="$BASEURL"/>
+                                            <xsl:text>/fedora/repository/</xsl:text>
+                                            <xsl:value-of select="$pid"/>
+                                            <xsl:text>/MEDIUM_SIZE</xsl:text>
+                                        </xsl:attribute>
+                                    </img>
+                                    <br/>
                       ( Full Size )
-                    </a>
-              </center>
-            </td>
-            <td>
-              <b>
-                <a>
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$BASEURL"/>
-                    <xsl:text>/fedora/repository/</xsl:text>
-                    <xsl:value-of select="$pid"/>/-/<xsl:value-of select="s:memberTitle"/>
-                  </xsl:attribute>
-                  <xsl:value-of select="s:memberTitle"/>
-                </a>
-              </b>
-              <br/>
-              <xsl:value-of select="s:memberDesc"/>
-            </td>
-          </tr>
-        </xsl:for-each>
-      </table>
-    </center>
-  </xsl:template>
+                                </a>
+                            </center>
+                        </td>
+                        <td>
+                            <b>
+                                <a>
+                                    <xsl:attribute name="href">
+                                        <xsl:value-of select="$BASEURL"/>
+                                        <xsl:text>/fedora/repository/</xsl:text>
+                                        <xsl:value-of select="$pid"/>/-/
+                                        <xsl:value-of select="s:memberTitle"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="s:memberTitle"/>
+                                </a>
+                            </b>
+                            <br/>
+                            <xsl:value-of select="s:memberDesc"/>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+        </center>
+    </xsl:template>
 </xsl:stylesheet>

collection_views/yui_coverflow/css/test.css

@@ -1,18 +1,18 @@
 body {
-	font-family: Arial;
-	font-size: 12px;
-	color: gray;
-	background: black;
+    font-family: Arial;
+    font-size: 12px;
+    color: gray;
+    background: black;
 }
 
 .title {
-	font-size: 18px;
-	font-weight: bold;
+    font-size: 18px;
+    font-weight: bold;
 }
 
 #coverFlowTest .coverFlowLabel {
-	margin-top: 10px;
-	font-size: 14px;
-	color: #C0C0C0;
-	font-weight: bold;
+    margin-top: 10px;
+    font-size: 14px;
+    color: #C0C0C0;
+    font-weight: bold;
 }

collection_views/yui_coverflow/js/test.js

@@ -3,34 +3,83 @@
 
 YAHOO.util.Event.onDOMReady(function(){
 
-	var images = [
-  				  {src: 'images/ardillitaMac.jpg', label: 'Ardileta!', onclick: function(){alert('image1');}},
-	              {src: 'http://farm2.static.flickr.com/1380/1426855399_b4b8eccbdb.jpg?v=0'},
-	              {src: 'http://farm1.static.flickr.com/69/213130158_0d1aa23576_d.jpg'},
-	              {src: 'http://farm1.static.flickr.com/69/213130158_0d1aa23576_d.jpg'},
-	              {src: 'images/msn2.jpg', label: 'My Mac'},
-	              {src: 'images/msn2.jpg', label: 'My Mac again...'}
+    var images = [
+    {
+        src: 'images/ardillitaMac.jpg',
+        label: 'Ardileta!',
+        onclick: function(){
+            alert('image1');
+        }
+    },
+{
+    src: 'http://farm2.static.flickr.com/1380/1426855399_b4b8eccbdb.jpg?v=0'
+},
+{
+    src: 'http://farm1.static.flickr.com/69/213130158_0d1aa23576_d.jpg'
+},
+{
+    src: 'http://farm1.static.flickr.com/69/213130158_0d1aa23576_d.jpg'
+},
+{
+    src: 'images/msn2.jpg',
+    label: 'My Mac'
+},
+{
+    src: 'images/msn2.jpg',
+    label: 'My Mac again...'
+}
 	              
-	              ];
-	var myCoverFlow = new YAHOO.ext.CoverFlow('coverFlowTest', {height: 200, width: 600, images: images});
-
-	function moveLeft(e, coverFlow){
-		coverFlow.selectNext();
-	}
-	function moveRight(e, coverFlow){
-		coverFlow.selectPrevious();
-	}
-	var myMoveLeftBtn = new YAHOO.widget.Button('moveLeftButton', {onclick: {fn: moveLeft, obj: myCoverFlow}});
-	var myMoveRightBtn = new YAHOO.widget.Button('moveRightButton', {onclick: {fn: moveRight, obj: myCoverFlow}});
+];
+var myCoverFlow = new YAHOO.ext.CoverFlow('coverFlowTest', {
+    height: 200,
+    width: 600,
+    images: images
+});
+
+function moveLeft(e, coverFlow){
+    coverFlow.selectNext();
+}
+function moveRight(e, coverFlow){
+    coverFlow.selectPrevious();
+}
+var myMoveLeftBtn = new YAHOO.widget.Button('moveLeftButton', {
+    onclick: {
+        fn: moveLeft,
+        obj: myCoverFlow
+    }
+});
+var myMoveRightBtn = new YAHOO.widget.Button('moveRightButton', {
+    onclick: {
+        fn: moveRight,
+        obj: myCoverFlow
+    }
+});
 
 	
-	var otherImages = [
-  				  {src: 'images/ardillitaMac.jpg', label: 'Ardileta!', onclick: function(){alert('image1');}},
-	              {src: 'images/msn2.jpg', label: 'My Mac'},
-	              {src: 'images/msn2.jpg', label: 'My Mac again...'}
+var otherImages = [
+{
+    src: 'images/ardillitaMac.jpg',
+    label: 'Ardileta!',
+    onclick: function(){
+        alert('image1');
+    }
+},
+{
+    src: 'images/msn2.jpg',
+    label: 'My Mac'
+},
+{
+    src: 'images/msn2.jpg',
+    label: 'My Mac again...'
+}
 	              
-	              ];	
-	var anotherCoverFlow = new YAHOO.ext.CoverFlow('anotherCoverFlowTest', {height: 150, width: 500, images: otherImages, bgColor: '#C0C0C0'});
+];	
+var anotherCoverFlow = new YAHOO.ext.CoverFlow('anotherCoverFlowTest', {
+    height: 150,
+    width: 500,
+    images: otherImages,
+    bgColor: '#C0C0C0'
+});
 
 
 

content_models/BASIC_AUDIO.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <content_model name="standard_qt">
-     <mimetypes>
-         <type>video/quicktime</type>
-     </mimetypes>
+    <mimetypes>
+        <type>video/quicktime</type>
+    </mimetypes>
     <display_in_fieldset>
         <datastream id="OBJ">
             <method>
@@ -28,15 +28,15 @@
             <methods/>
         </rule>
     </ingest_rules>
-       <ingest_form dsid="QDC" page="2">
+    <ingest_form dsid="QDC" page="2">
         <form_builder_method>
             <file>plugins/QtFormBuilder.php</file>
             <class_name>QtFormBuilder</class_name>
             <method_name>buildQDCForm</method_name>
             <form_handler>handleQDCForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Title/Caption/Video Name</label>
                 <name>dc:title</name>
@@ -215,4 +215,4 @@
             </element>
         </form_elements>
     </ingest_form>
-    </content_model>
+</content_model>

content_models/BASIC_VIDEO.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <content_model name="standard_qt">
-     <mimetypes>
-         <type>video/quicktime</type>
-     </mimetypes>
+    <mimetypes>
+        <type>video/quicktime</type>
+    </mimetypes>
     <display_in_fieldset>
         <datastream id="OBJ">
             <method>
@@ -28,15 +28,15 @@
             <methods/>
         </rule>
     </ingest_rules>
-       <ingest_form dsid="QDC" page="2">
+    <ingest_form dsid="QDC" page="2">
         <form_builder_method>
             <file>plugins/QtFormBuilder.php</file>
             <class_name>QtFormBuilder</class_name>
             <method_name>buildQDCForm</method_name>
             <form_handler>handleQDCForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Title/Caption/Video Name</label>
                 <name>dc:title</name>
@@ -215,4 +215,4 @@
             </element>
         </form_elements>
     </ingest_form>
-    </content_model>
+</content_model>

content_models/COLLECTIONCM.xml

@@ -1,88 +1,89 @@
+
 <content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Collection" version="2" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
-  <mimetypes>
-    <type>text/xml</type>
-    <type>text/plain</type>
-    <type>application/xml</type>
-  </mimetypes>
-  <ingest_rules></ingest_rules>
-  <datastreams>
-    <datastream dsid="DC">
-      <display_method class="CollectionClass" file="CollectionClass.inc" method="showFieldSets" module=""></display_method>
-    </datastream>
-    <datastream dsid="TN"></datastream>
-    <datastream dsid="COLLECTION_POLICY"></datastream>
-  </datastreams>
-  <ingest_form dsid="QDC" page="2">
-    <form_builder_method class="CollectionFormBuilder" file="plugins/CollectionFormBuilder.inc" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
-    <form_elements>
-      <element label="Title/Caption/Object Name" name="dc:title" required="true" type="textfield">
-        <description>The name given to the resource</description>
-      </element>
-      <element label="Creator/Photographer/Author" name="dc:creator" type="textfield">
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-      </element>
-      <element label="Subject" name="dc:subject" type="select">
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-        <authoritative_list>
-          <item>none</item>
-          <item>Multi Media</item>
-          <item>image</item>
-          <item>meeting</item>
-          <item>presentation</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Description" name="dc:description" required="true" type="textarea">
-        <description>Examples include an abstract, table of contents, or free-text account of the content of the resource.</description>
-      </element>
-      <element label="Publisher" name="dc:publisher" type="textfield">
-        <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
-      </element>
-      <element label="Contributor" name="dc:contributor" type="textfield">
-        <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
-      </element>
-      <element label="Date" name="dc:date" type="textfield">
-        <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
-      </element>
-      <element label="Resource Type" name="dc:type" type="select">
-        <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
-        <authoritative_list>
-          <item>none</item>
-          <item>collection</item>
-          <item>dataset</item>
-          <item>event</item>
-          <item>image</item>
-          <item>interactive resource</item>
-          <item>model</item>
-          <item>party</item>
-          <item>physical object</item>
-          <item>place</item>
-          <item>service</item>
-          <item>software</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Source" name="dc:source" type="textfield">
-        <description>A reference to a resource from which the present resource is derived.</description>
-      </element>
-      <element label="Identifier" name="dc:identifier" type="textfield">
-        <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
-      </element>
-      <element label="Language" name="dc:language" type="select">
-        <description>The language of the intellectual content of the resource.</description>
-        <authoritative_list>
-          <item field="eng">English</item>
-          <item field="fre">French</item>
-        </authoritative_list>
-      </element>
-      <element label="Relation" name="dc:relation" type="textfield">
-        <description>Reference to a related resource.</description>
-      </element>
-      <element label="Rights Management" name="dc:rights" type="textarea">
-        <description>Information about intellectual property rights, copyright, and various property rights.</description>
-      </element>
-    </form_elements>
-  </ingest_form>
+    <mimetypes>
+        <type>text/xml</type>
+        <type>text/plain</type>
+        <type>application/xml</type>
+    </mimetypes>
+    <ingest_rules></ingest_rules>
+    <datastreams>
+        <datastream dsid="DC">
+            <display_method class="CollectionClass" file="CollectionClass.inc" method="showFieldSets" module=""></display_method>
+        </datastream>
+        <datastream dsid="TN"></datastream>
+        <datastream dsid="COLLECTION_POLICY"></datastream>
+    </datastreams>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method class="CollectionFormBuilder" file="plugins/CollectionFormBuilder.inc" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
+        <form_elements>
+            <element label="Title/Caption/Object Name" name="dc:title" required="true" type="textfield">
+                <description>The name given to the resource</description>
+            </element>
+            <element label="Creator/Photographer/Author" name="dc:creator" type="textfield">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Subject" name="dc:subject" type="select">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+                <authoritative_list>
+                    <item>none</item>
+                    <item>Multi Media</item>
+                    <item>image</item>
+                    <item>meeting</item>
+                    <item>presentation</item>
+                    <item>sound</item>
+                    <item>text</item>
+                </authoritative_list>
+            </element>
+            <element label="Description" name="dc:description" required="true" type="textarea">
+                <description>Examples include an abstract, table of contents, or free-text account of the content of the resource.</description>
+            </element>
+            <element label="Publisher" name="dc:publisher" type="textfield">
+                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+            </element>
+            <element label="Contributor" name="dc:contributor" type="textfield">
+                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Date" name="dc:date" type="textfield">
+                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+            </element>
+            <element label="Resource Type" name="dc:type" type="select">
+                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+                <authoritative_list>
+                    <item>none</item>
+                    <item>collection</item>
+                    <item>dataset</item>
+                    <item>event</item>
+                    <item>image</item>
+                    <item>interactive resource</item>
+                    <item>model</item>
+                    <item>party</item>
+                    <item>physical object</item>
+                    <item>place</item>
+                    <item>service</item>
+                    <item>software</item>
+                    <item>sound</item>
+                    <item>text</item>
+                </authoritative_list>
+            </element>
+            <element label="Source" name="dc:source" type="textfield">
+                <description>A reference to a resource from which the present resource is derived.</description>
+            </element>
+            <element label="Identifier" name="dc:identifier" type="textfield">
+                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+            </element>
+            <element label="Language" name="dc:language" type="select">
+                <description>The language of the intellectual content of the resource.</description>
+                <authoritative_list>
+                    <item field="eng">English</item>
+                    <item field="fre">French</item>
+                </authoritative_list>
+            </element>
+            <element label="Relation" name="dc:relation" type="textfield">
+                <description>Reference to a related resource.</description>
+            </element>
+            <element label="Rights Management" name="dc:rights" type="textarea">
+                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>

content_models/FAS_slideCModel.xml

@@ -1,166 +1,167 @@
+
 <content_model name="standard_slide">
-  <mimetypes>
-    <type>image/tiff</type>
-    <type>image/tif</type>
-  </mimetypes>
-  <display_in_fieldset>
-    <datastream id="JPG">
-      <method>
-        <file>plugins/slide_viewer.inc</file>
-        <class_name>ShowSlideStreamsInFieldSets</class_name>
-        <method_name>showJPG</method_name>
-      </method>
-    </datastream>
-    <datastream id="JP2"/>
-    <datastream id="FULL_SIZE"/>
-    <datastream id="FULL_JPG"/>
-  </display_in_fieldset>
-  <ingest_rules>
-    <rule>
-      <applies_to>
+    <mimetypes>
+        <type>image/tiff</type>
+        <type>image/tif</type>
+    </mimetypes>
+    <display_in_fieldset>
+        <datastream id="JPG">
+            <method>
+                <file>plugins/slide_viewer.inc</file>
+                <class_name>ShowSlideStreamsInFieldSets</class_name>
+                <method_name>showJPG</method_name>
+            </method>
+        </datastream>
+        <datastream id="JP2"/>
+        <datastream id="FULL_SIZE"/>
+        <datastream id="FULL_JPG"/>
+    </display_in_fieldset>
+    <ingest_rules>
+        <rule>
+            <applies_to>
               image/tiff
             </applies_to>
-      <applies_to>
+            <applies_to>
               image/tif
-      </applies_to>
-      <methods>
-        <method>
-          <file>plugins/ImageManipulation.inc</file>
-          <class_name>ImageManipulation</class_name>
-          <method_name>createJP2</method_name>
-          <modified_files_ext>jp2</modified_files_ext>
-          <datastream_id>JP2</datastream_id>
-        </method>
-      </methods>
-    </rule>
-  </ingest_rules>
-  <ingest_form dsid="QDC" page="2">
-    <form_builder_method>
-      <file>plugins/DemoFormBuilder.inc</file>
-      <class_name>DemoFormBuilder</class_name>
-      <method_name>buildQDCForm</method_name>
-      <form_handler>handleQDCForm</form_handler>
-    </form_builder_method>
-    <form_elements>
-      <element>
-        <label>Title/Caption/Image Name</label>
-        <name>dc:title</name>
-        <type>textfield</type>
-        <description>The name given to the resource</description>
-        <required>true</required>
-      </element>
-      <element>
-        <label>Creator/Photographer</label>
-        <name>dc:creator</name>
-        <type>textfield</type>
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Subject</label>
-        <name>dc:subject</name>
-        <type>select</type>
-        <description>Subject</description>
-        <required>false</required>
-        <authoritative_list>
-          <item>
-            <field>image</field>
-            <value>image</value>
-          </item>
-          <item>
-            <field>photograph</field>
-            <value>photograph</value>
-          </item>
-          <item>
-            <field>presentation</field>
-            <value>presentation</value>
-          </item>
-          <item>
-            <field>art</field>
-            <value>art</value>
-          </item>
-        </authoritative_list>
-      </element>
-      <element>
-        <label>Description</label>
-        <name>dc:description</name>
-        <type>textarea</type>
-        <description>Description of the Image</description>
-        <required>true</required>
-      </element>
-      <element>
-        <label>Publisher</label>
-        <name>dc:publisher</name>
-        <type>textfield</type>
-        <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Contributor</label>
-        <name>dc:contributor</name>
-        <type>textfield</type>
-        <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Date</label>
-        <name>dc:date</name>
-        <type>textfield</type>
-        <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Resource Type</label>
-        <name>dc:type</name>
-        <type>textfield</type>
-        <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Source</label>
-        <name>dc:source</name>
-        <type>textfield</type>
-        <description>A reference to a resource from which the present resource is derived.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Identifier</label>
-        <name>dc:identifier</name>
-        <type>textfield</type>
-        <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Language</label>
-        <name>dc:language</name>
-        <type>select</type>
-        <description>The language of the intellectual content of the resource.</description>
-        <required>false</required>
-        <authoritative_list>
-          <item>
-            <field>eng</field>
-            <value>English</value>
-          </item>
-          <item>
-            <field>fre</field>
-            <value>French</value>
-          </item>
-        </authoritative_list>
-      </element>
-      <element>
-        <label>Relation</label>
-        <name>dc:relation</name>
-        <type>textfield</type>
-        <description>Reference to a related resource.</description>
-        <required>false</required>
-      </element>
-      <element>
-        <label>Rights Management</label>
-        <name>dc:rights</name>
-        <type>textarea</type>
-        <description>Information about intellectual property rights, copyright, and various property rights.</description>
-        <required>false</required>
-      </element>
-    </form_elements>
-  </ingest_form>
+            </applies_to>
+            <methods>
+                <method>
+                    <file>plugins/ImageManipulation.inc</file>
+                    <class_name>ImageManipulation</class_name>
+                    <method_name>createJP2</method_name>
+                    <modified_files_ext>jp2</modified_files_ext>
+                    <datastream_id>JP2</datastream_id>
+                </method>
+            </methods>
+        </rule>
+    </ingest_rules>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method>
+            <file>plugins/DemoFormBuilder.inc</file>
+            <class_name>DemoFormBuilder</class_name>
+            <method_name>buildQDCForm</method_name>
+            <form_handler>handleQDCForm</form_handler>
+        </form_builder_method>
+        <form_elements>
+            <element>
+                <label>Title/Caption/Image Name</label>
+                <name>dc:title</name>
+                <type>textfield</type>
+                <description>The name given to the resource</description>
+                <required>true</required>
+            </element>
+            <element>
+                <label>Creator/Photographer</label>
+                <name>dc:creator</name>
+                <type>textfield</type>
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Subject</label>
+                <name>dc:subject</name>
+                <type>select</type>
+                <description>Subject</description>
+                <required>false</required>
+                <authoritative_list>
+                    <item>
+                        <field>image</field>
+                        <value>image</value>
+                    </item>
+                    <item>
+                        <field>photograph</field>
+                        <value>photograph</value>
+                    </item>
+                    <item>
+                        <field>presentation</field>
+                        <value>presentation</value>
+                    </item>
+                    <item>
+                        <field>art</field>
+                        <value>art</value>
+                    </item>
+                </authoritative_list>
+            </element>
+            <element>
+                <label>Description</label>
+                <name>dc:description</name>
+                <type>textarea</type>
+                <description>Description of the Image</description>
+                <required>true</required>
+            </element>
+            <element>
+                <label>Publisher</label>
+                <name>dc:publisher</name>
+                <type>textfield</type>
+                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Contributor</label>
+                <name>dc:contributor</name>
+                <type>textfield</type>
+                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Date</label>
+                <name>dc:date</name>
+                <type>textfield</type>
+                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Resource Type</label>
+                <name>dc:type</name>
+                <type>textfield</type>
+                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Source</label>
+                <name>dc:source</name>
+                <type>textfield</type>
+                <description>A reference to a resource from which the present resource is derived.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Identifier</label>
+                <name>dc:identifier</name>
+                <type>textfield</type>
+                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Language</label>
+                <name>dc:language</name>
+                <type>select</type>
+                <description>The language of the intellectual content of the resource.</description>
+                <required>false</required>
+                <authoritative_list>
+                    <item>
+                        <field>eng</field>
+                        <value>English</value>
+                    </item>
+                    <item>
+                        <field>fre</field>
+                        <value>French</value>
+                    </item>
+                </authoritative_list>
+            </element>
+            <element>
+                <label>Relation</label>
+                <name>dc:relation</name>
+                <type>textfield</type>
+                <description>Reference to a related resource.</description>
+                <required>false</required>
+            </element>
+            <element>
+                <label>Rights Management</label>
+                <name>dc:rights</name>
+                <type>textarea</type>
+                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+                <required>false</required>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>

content_models/REFWORKSCM.xml

@@ -7,14 +7,14 @@
                 <class_name>ShowStreamsInFieldSets</class_name>
                 <method_name>showQdc</method_name>
             </method>
-            </datastream>
-            <datastream id="refworks">
-                <method>
-                    <file>plugins/ShowStreamsInFieldSets.inc</file>
-                    <class_name>ShowStreamsInFieldSets</class_name>
-                    <method_name>showRefworks</method_name>
-                </method>
-            </datastream>
+        </datastream>
+        <datastream id="refworks">
+            <method>
+                <file>plugins/ShowStreamsInFieldSets.inc</file>
+                <class_name>ShowStreamsInFieldSets</class_name>
+                <method_name>showRefworks</method_name>
+            </method>
+        </datastream>
         <datastream id="romeo">
             <method>
                 <file>plugins/ShowStreamsInFieldSets.inc</file>
@@ -29,10 +29,10 @@
             
         </datastream>
     </display_in_fieldset>
-     <mimetypes>
+    <mimetypes>
         <type>text/xml</type>
-         <type>text/plain</type>
-         <type>application/xml</type>
+        <type>text/plain</type>
+        <type>application/xml</type>
     </mimetypes>
     <ingest_rules>
         <rule>
@@ -59,8 +59,8 @@
             <method_name>buildForm</method_name>
             <form_handler>handleForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Ingest</label>
                 <name>hiddenvalue</name>

content_models/REFWORKSCM_1.xml

@@ -7,14 +7,14 @@
                 <class_name>ShowStreamsInFieldSets</class_name>
                 <method_name>showQdc</method_name>
             </method>
-            </datastream>
-            <datastream id="refworks">
-                <method>
-                    <file>plugins/ShowStreamsInFieldSets.inc</file>
-                    <class_name>ShowStreamsInFieldSets</class_name>
-                    <method_name>showRefworks</method_name>
-                </method>
-            </datastream>
+        </datastream>
+        <datastream id="refworks">
+            <method>
+                <file>plugins/ShowStreamsInFieldSets.inc</file>
+                <class_name>ShowStreamsInFieldSets</class_name>
+                <method_name>showRefworks</method_name>
+            </method>
+        </datastream>
         <datastream id="romeo">
             <method>
                 <file>plugins/ShowStreamsInFieldSets.inc</file>
@@ -29,10 +29,10 @@
             
         </datastream>
     </display_in_fieldset>
-     <mimetypes>
+    <mimetypes>
         <type>text/xml</type>
-         <type>text/plain</type>
-         <type>application/xml</type>
+        <type>text/plain</type>
+        <type>application/xml</type>
     </mimetypes>
     <ingest_rules>
         <rule>
@@ -59,8 +59,8 @@
             <method_name>buildForm</method_name>
             <form_handler>handleForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Ingest</label>
                 <name>hiddenvalue</name>

content_models/STANDARD JPG.xml

@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard_jpeg" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd"> 
-  <mimetypes> 
-    <type>image/jpeg</type> 
-  </mimetypes> 
-  <ingest_rules> 
-    <rule> 
-      <applies_to>image/jpeg</applies_to> 
-      <ingest_methods> 
-        <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg"> 
-          <parameters> 
-            <parameter name="width">160</parameter> 
-            <parameter name="height">120</parameter> 
-          </parameters> 
-        </ingest_method> 
-        <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="TN" modified_files_ext="jpg"> 
-          <parameters> 
-            <parameter name="width">120</parameter> 
-            <parameter name="height">120</parameter> 
-          </parameters> 
-        </ingest_method> 
-      </ingest_methods> 
-    </rule> 
-  </ingest_rules> 
-  <datastreams> 
-    <datastream dsid="MEDIUM_SIZE"> 
-      <display_method module="" file="plugins/ShowDemoStreamsInFieldSets.inc" class="ShowDemoStreamsInFieldSets" method="showMediumSize"/> 
-    </datastream> 
-    <datastream dsid="QDC"> 
-      <display_method module="" file="plugins/ShowStreamsInFieldSets.inc" class="ShowStreamsInFieldSets" method="showQdc"/> 
-    </datastream> 
-    <datastream dsid="FULL_SIZE"> 
-      <add_datastream_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg"> 
-        <parameters> 
-          <parameter name="width">120</parameter> 
-          <parameter name="height">160</parameter> 
-        </parameters> 
-      </add_datastream_method> 
-    </datastream> 
-  </datastreams> 
-  <ingest_form dsid="QDC" page="2"> 
-    <form_builder_method module="" file="plugins/DemoFormBuilder.inc" class="DemoFormBuilder" method="buildQDCForm" handler="handleQDCForm"/> 
-    <form_elements> 
-      <element label="Title/Caption/Image Name" name="dc:title" type="textfield" required="true"> 
-        <description>The name given to the resource</description> 
-      </element> 
-      <element label="Creator/Photographer" name="dc:creator" type="textfield"> 
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description> 
-      </element> 
-      <element label="Subject" name="dc:subject" type="select"> 
-        <description>Subject</description> 
-        <authoritative_list> 
-          <item>image</item> 
-          <item>photograph</item> 
-          <item>presentation</item> 
-          <item>art</item> 
-        </authoritative_list> 
-      </element> 
-      <element label="Description" name="dc:description" type="textarea" required="true"> 
-        <description>Description of the Image</description> 
-      </element> 
-      <element label="Publisher" name="dc:publisher" type="textfield"> 
-        <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description> 
-      </element> 
-      <element label="Contributor" name="dc:contributor" type="textfield"> 
-        <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description> 
-      </element> 
-      <element label="Date" name="dc:date" type="textfield"> 
-        <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description> 
-      </element> 
-      <element label="Resource Type" name="dc:type" type="textfield"> 
-        <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description> 
-      </element> 
-      <element label="Source" name="dc:source" type="textfield"> 
-        <description>A reference to a resource from which the present resource is derived.</description> 
-      </element> 
-      <element label="Identifier" name="dc:identifier" type="textfield"> 
-        <description>A unique reference to the resource; In this instance, the accession number or collection number.</description> 
-      </element> 
-      <element label="Language" name="dc:language" type="select"> 
-        <description>The language of the intellectual content of the resource.</description> 
-        <authoritative_list> 
-          <item field="eng">English</item> 
-          <item field="fre">French</item> 
-        </authoritative_list> 
-      </element> 
-      <element label="Relation" name="dc:relation" type="textfield"> 
-        <description>Reference to a related resource.</description> 
-      </element> 
-      <element label="Rights Management" name="dc:rights" type="textarea"> 
-        <description>Information about intellectual property rights, copyright, and various property rights.</description> 
-      </element> 
-    </form_elements> 
-  </ingest_form> 
+    <mimetypes>
+        <type>image/jpeg</type>
+    </mimetypes>
+    <ingest_rules>
+        <rule>
+            <applies_to>image/jpeg</applies_to>
+            <ingest_methods>
+                <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg">
+                    <parameters>
+                        <parameter name="width">160</parameter>
+                        <parameter name="height">120</parameter>
+                    </parameters>
+                </ingest_method>
+                <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="TN" modified_files_ext="jpg">
+                    <parameters>
+                        <parameter name="width">120</parameter>
+                        <parameter name="height">120</parameter>
+                    </parameters>
+                </ingest_method>
+            </ingest_methods>
+        </rule>
+    </ingest_rules>
+    <datastreams>
+        <datastream dsid="MEDIUM_SIZE">
+            <display_method module="" file="plugins/ShowDemoStreamsInFieldSets.inc" class="ShowDemoStreamsInFieldSets" method="showMediumSize"/>
+        </datastream>
+        <datastream dsid="QDC">
+            <display_method module="" file="plugins/ShowStreamsInFieldSets.inc" class="ShowStreamsInFieldSets" method="showQdc"/>
+        </datastream>
+        <datastream dsid="FULL_SIZE">
+            <add_datastream_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg">
+                <parameters>
+                    <parameter name="width">120</parameter>
+                    <parameter name="height">160</parameter>
+                </parameters>
+            </add_datastream_method>
+        </datastream>
+    </datastreams>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method module="" file="plugins/DemoFormBuilder.inc" class="DemoFormBuilder" method="buildQDCForm" handler="handleQDCForm"/>
+        <form_elements>
+            <element label="Title/Caption/Image Name" name="dc:title" type="textfield" required="true">
+                <description>The name given to the resource</description>
+            </element>
+            <element label="Creator/Photographer" name="dc:creator" type="textfield">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Subject" name="dc:subject" type="select">
+                <description>Subject</description>
+                <authoritative_list>
+                    <item>image</item>
+                    <item>photograph</item>
+                    <item>presentation</item>
+                    <item>art</item>
+                </authoritative_list>
+            </element>
+            <element label="Description" name="dc:description" type="textarea" required="true">
+                <description>Description of the Image</description>
+            </element>
+            <element label="Publisher" name="dc:publisher" type="textfield">
+                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+            </element>
+            <element label="Contributor" name="dc:contributor" type="textfield">
+                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Date" name="dc:date" type="textfield">
+                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+            </element>
+            <element label="Resource Type" name="dc:type" type="textfield">
+                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+            </element>
+            <element label="Source" name="dc:source" type="textfield">
+                <description>A reference to a resource from which the present resource is derived.</description>
+            </element>
+            <element label="Identifier" name="dc:identifier" type="textfield">
+                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+            </element>
+            <element label="Language" name="dc:language" type="select">
+                <description>The language of the intellectual content of the resource.</description>
+                <authoritative_list>
+                    <item field="eng">English</item>
+                    <item field="fre">French</item>
+                </authoritative_list>
+            </element>
+            <element label="Relation" name="dc:relation" type="textfield">
+                <description>Reference to a related resource.</description>
+            </element>
+            <element label="Rights Management" name="dc:rights" type="textarea">
+                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>

content_models/STANDARD PDF.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <content_model name="standard_pdf">
-     <mimetypes>
+    <mimetypes>
         <type>application/pdf</type>
-         </mimetypes>
+    </mimetypes>
     <ingest_rules>
         <rule>
             <applies_to>
               application/pdf
             </applies_to>
-             <methods>
+            <methods>
                 <method>
                     <file>plugins/ImageManipulation.inc</file>
                     <class_name>ImageManipulation</class_name>
@@ -32,7 +32,7 @@
                 </disseminator>
             </disseminators>
         </rule>
-      </ingest_rules>a868aef684fa34923d4fe697db1e785b
+    </ingest_rules>a868aef684fa34923d4fe697db1e785b
     <ingest_form dsid="QDC" page="2">
         <form_builder_method>
             <file>plugins/FormBuilder.inc</file>
@@ -40,8 +40,8 @@
             <method_name>buildQDCForm</method_name>
             <form_handler>handleQDCForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Title/Caption/Object Name</label>
                 <name>dc:title</name>
@@ -233,4 +233,4 @@
             </element>
         </form_elements>
     </ingest_form>
-  </content_model>
+</content_model>

content_models/STANDARD_FLVCM.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <content_model name="standard_flv">
-     <mimetypes>
-         <type>video/x-flv</type>
-     </mimetypes>
+    <mimetypes>
+        <type>video/x-flv</type>
+    </mimetypes>
     <display_in_fieldset>
         <datastream id="FLV">
             <method>
@@ -28,15 +28,15 @@
             <methods/>
         </rule>
     </ingest_rules>
-       <ingest_form dsid="QDC" page="2">
+    <ingest_form dsid="QDC" page="2">
         <form_builder_method>
             <file>plugins/FlvFormBuilder.inc</file>
             <class_name>FlvFormBuilder</class_name>
             <method_name>buildQDCForm</method_name>
             <form_handler>handleQDCForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Title/Caption/Video Name</label>
                 <name>dc:title</name>
@@ -215,4 +215,4 @@
             </element>
         </form_elements>
     </ingest_form>
-    </content_model>
+</content_model>

content_models/STANDARD_IMAGECM.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <content_model name="standard_image">
-     <mimetypes>
+    <mimetypes>
         <type>image/jpeg</type>
         <type>image/gif</type>
         <type>image/png</type>
-         <type>image/tiff</type>
-         <type>image/tif</type>
+        <type>image/tiff</type>
+        <type>image/tif</type>
     </mimetypes>
     <ingest_rules>
         <rule>
@@ -29,7 +29,7 @@
                 <method>
                     <file>plugins/ImageManipulation.inc</file>
                     <class_name>ImageManipulation</class_name>
-                     <method_name>createThumbnail</method_name>
+                    <method_name>createThumbnail</method_name>
                     <modified_files_ext>jpg</modified_files_ext>
                     <datastream_id>TN</datastream_id>
                     <parameters>
@@ -43,7 +43,7 @@
                     <method_name>createPNG</method_name>
                     <modified_files_ext>png</modified_files_ext>
                     <datastream_id>PNG</datastream_id>
-                  </method>
+                </method>
                 <method>
                     <file>plugins/ImageManipulation.inc</file>
                     <class_name>ImageManipulation</class_name>
@@ -67,7 +67,7 @@
                 </disseminator>
             </disseminators>
         </rule>
-       </ingest_rules>a868aef684fa34923d4fe697db1e785b
+    </ingest_rules>a868aef684fa34923d4fe697db1e785b
     <ingest_form dsid='QDC' page="2">
         <form_builder_method>
             <file>plugins/FormBuilder.inc</file>
@@ -75,8 +75,8 @@
             <method_name>buildQDCForm</method_name>
             <form_handler>handleQDCForm</form_handler>
             <!--need validation method as well-->
-            </form_builder_method>
-            <form_elements>
+        </form_builder_method>
+        <form_elements>
             <element>
                 <label>Title/Caption/Object Name</label>
                 <name>dc:title</name>
@@ -268,4 +268,4 @@
             </element>
         </form_elements>
     </ingest_form>
-  </content_model>
+</content_model>

content_models/STANDARD_JPG.xml

@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard_jpeg" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd"> 
-  <mimetypes> 
-    <type>image/jpeg</type> 
-  </mimetypes> 
-  <ingest_rules> 
-    <rule> 
-      <applies_to>image/jpeg</applies_to> 
-      <ingest_methods> 
-        <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg"> 
-          <parameters> 
-            <parameter name="width">160</parameter> 
-            <parameter name="height">120</parameter> 
-          </parameters> 
-        </ingest_method> 
-        <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="TN" modified_files_ext="jpg"> 
-          <parameters> 
-            <parameter name="width">120</parameter> 
-            <parameter name="height">120</parameter> 
-          </parameters> 
-        </ingest_method> 
-      </ingest_methods> 
-    </rule> 
-  </ingest_rules> 
-  <datastreams> 
-    <datastream dsid="MEDIUM_SIZE"> 
-      <display_method module="" file="plugins/ShowDemoStreamsInFieldSets.inc" class="ShowDemoStreamsInFieldSets" method="showMediumSize"/> 
-    </datastream> 
-    <datastream dsid="QDC"> 
-      <display_method module="" file="plugins/ShowStreamsInFieldSets.inc" class="ShowStreamsInFieldSets" method="showQdc"/> 
-    </datastream> 
-    <datastream dsid="FULL_SIZE"> 
-      <add_datastream_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg"> 
-        <parameters> 
-          <parameter name="width">120</parameter> 
-          <parameter name="height">160</parameter> 
-        </parameters> 
-      </add_datastream_method> 
-    </datastream> 
-  </datastreams> 
-  <ingest_form dsid="QDC" page="2"> 
-    <form_builder_method module="" file="plugins/DemoFormBuilder.inc" class="DemoFormBuilder" method="buildQDCForm" handler="handleQDCForm"/> 
-    <form_elements> 
-      <element label="Title/Caption/Image Name" name="dc:title" type="textfield" required="true"> 
-        <description>The name given to the resource</description> 
-      </element> 
-      <element label="Creator/Photographer" name="dc:creator" type="textfield"> 
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description> 
-      </element> 
-      <element label="Subject" name="dc:subject" type="select"> 
-        <description>Subject</description> 
-        <authoritative_list> 
-          <item>image</item> 
-          <item>photograph</item> 
-          <item>presentation</item> 
-          <item>art</item> 
-        </authoritative_list> 
-      </element> 
-      <element label="Description" name="dc:description" type="textarea" required="true"> 
-        <description>Description of the Image</description> 
-      </element> 
-      <element label="Publisher" name="dc:publisher" type="textfield"> 
-        <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description> 
-      </element> 
-      <element label="Contributor" name="dc:contributor" type="textfield"> 
-        <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description> 
-      </element> 
-      <element label="Date" name="dc:date" type="textfield"> 
-        <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description> 
-      </element> 
-      <element label="Resource Type" name="dc:type" type="textfield"> 
-        <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description> 
-      </element> 
-      <element label="Source" name="dc:source" type="textfield"> 
-        <description>A reference to a resource from which the present resource is derived.</description> 
-      </element> 
-      <element label="Identifier" name="dc:identifier" type="textfield"> 
-        <description>A unique reference to the resource; In this instance, the accession number or collection number.</description> 
-      </element> 
-      <element label="Language" name="dc:language" type="select"> 
-        <description>The language of the intellectual content of the resource.</description> 
-        <authoritative_list> 
-          <item field="eng">English</item> 
-          <item field="fre">French</item> 
-        </authoritative_list> 
-      </element> 
-      <element label="Relation" name="dc:relation" type="textfield"> 
-        <description>Reference to a related resource.</description> 
-      </element> 
-      <element label="Rights Management" name="dc:rights" type="textarea"> 
-        <description>Information about intellectual property rights, copyright, and various property rights.</description> 
-      </element> 
-    </form_elements> 
-  </ingest_form> 
+    <mimetypes>
+        <type>image/jpeg</type>
+    </mimetypes>
+    <ingest_rules>
+        <rule>
+            <applies_to>image/jpeg</applies_to>
+            <ingest_methods>
+                <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg">
+                    <parameters>
+                        <parameter name="width">160</parameter>
+                        <parameter name="height">120</parameter>
+                    </parameters>
+                </ingest_method>
+                <ingest_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="TN" modified_files_ext="jpg">
+                    <parameters>
+                        <parameter name="width">120</parameter>
+                        <parameter name="height">120</parameter>
+                    </parameters>
+                </ingest_method>
+            </ingest_methods>
+        </rule>
+    </ingest_rules>
+    <datastreams>
+        <datastream dsid="MEDIUM_SIZE">
+            <display_method module="" file="plugins/ShowDemoStreamsInFieldSets.inc" class="ShowDemoStreamsInFieldSets" method="showMediumSize"/>
+        </datastream>
+        <datastream dsid="QDC">
+            <display_method module="" file="plugins/ShowStreamsInFieldSets.inc" class="ShowStreamsInFieldSets" method="showQdc"/>
+        </datastream>
+        <datastream dsid="FULL_SIZE">
+            <add_datastream_method module="" file="plugins/ImageManipulation.inc" class="ImageManipulation" method="manipulateImage" dsid="MEDIUM_SIZE" modified_files_ext="jpg">
+                <parameters>
+                    <parameter name="width">120</parameter>
+                    <parameter name="height">160</parameter>
+                </parameters>
+            </add_datastream_method>
+        </datastream>
+    </datastreams>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method module="" file="plugins/DemoFormBuilder.inc" class="DemoFormBuilder" method="buildQDCForm" handler="handleQDCForm"/>
+        <form_elements>
+            <element label="Title/Caption/Image Name" name="dc:title" type="textfield" required="true">
+                <description>The name given to the resource</description>
+            </element>
+            <element label="Creator/Photographer" name="dc:creator" type="textfield">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Subject" name="dc:subject" type="select">
+                <description>Subject</description>
+                <authoritative_list>
+                    <item>image</item>
+                    <item>photograph</item>
+                    <item>presentation</item>
+                    <item>art</item>
+                </authoritative_list>
+            </element>
+            <element label="Description" name="dc:description" type="textarea" required="true">
+                <description>Description of the Image</description>
+            </element>
+            <element label="Publisher" name="dc:publisher" type="textfield">
+                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+            </element>
+            <element label="Contributor" name="dc:contributor" type="textfield">
+                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Date" name="dc:date" type="textfield">
+                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+            </element>
+            <element label="Resource Type" name="dc:type" type="textfield">
+                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+            </element>
+            <element label="Source" name="dc:source" type="textfield">
+                <description>A reference to a resource from which the present resource is derived.</description>
+            </element>
+            <element label="Identifier" name="dc:identifier" type="textfield">
+                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+            </element>
+            <element label="Language" name="dc:language" type="select">
+                <description>The language of the intellectual content of the resource.</description>
+                <authoritative_list>
+                    <item field="eng">English</item>
+                    <item field="fre">French</item>
+                </authoritative_list>
+            </element>
+            <element label="Relation" name="dc:relation" type="textfield">
+                <description>Reference to a related resource.</description>
+            </element>
+            <element label="Rights Management" name="dc:rights" type="textarea">
+                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>

content_models/STANDARD_QT.xml

@@ -1,137 +1,148 @@
 
 <content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard_qt" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
-  <mimetypes>
-    <type>video/quicktime</type>
-    <type>video/mp4</type>
+    <mimetypes>
+        <type>video/quicktime</type>
+        <type>video/mp4</type>
 
-    <type>audio/mp3</type>
-    <type>audio/x-aiff</type>
-  </mimetypes>
-  <ingest_rules>
-    <rule>
-      <applies_to>video/quicktime</applies_to>
-      <applies_to>video/mp4</applies_to>
+        <type>audio/mp3</type>
+        <type>audio/x-aiff</type>
+    </mimetypes>
+    <ingest_rules>
+        <rule>
+            <applies_to>video/quicktime</applies_to>
+            <applies_to>video/mp4</applies_to>
      
-      <applies_to>audio/mp3</applies_to>
-      <applies_to>audio/x-aiff</applies_to>
-      <ingest_methods>
-        <ingest_method file="plugins/Exiftool.inc" class="Exiftool" method="extractMetadata" dsid="OBJ_EXIFTOOL" modified_files_ext="">
-          <parameters></parameters>
-        </ingest_method>
+            <applies_to>audio/mp3</applies_to>
+            <applies_to>audio/x-aiff</applies_to>
+            <ingest_methods>
+                <ingest_method file="plugins/Exiftool.inc" class="Exiftool" method="extractMetadata" dsid="OBJ_EXIFTOOL" modified_files_ext="">
+                    <parameters></parameters>
+                </ingest_method>
 
-        <ingest_method class="Ffmpeg" dsid="FULL_SIZE" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
-          <parameters>
-          </parameters>
-        </ingest_method>
+                <ingest_method class="Ffmpeg" dsid="FULL_SIZE" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
+                    <parameters>
+                    </parameters>
+                </ingest_method>
 
-        <ingest_method class="Ffmpeg" dsid="TN" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
-          <parameters>
-            <parameter name="s">92x92</parameter>
-          </parameters>
-        </ingest_method>
-      </ingest_methods>
-    </rule>
-  </ingest_rules>
-  <datastreams>
-    <datastream dsid="OBJ">
-      <display_method class="ShowQtStreamsInFieldSets" file="plugins/qt_viewer.inc" method="showQt" module=""></display_method>
-    </datastream>
-    <datastream dsid="PROXY"></datastream>
-    <datastream dsid="OBJ_EXIFTOOL"></datastream>
-    <datastream dsid="TN"></datastream>
-    <datastream dsid="FULL_SIZE"></datastream>
-    <datastream dsid="QDC">
-      <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showQdc" module=""></display_method>
-    </datastream>
-  </datastreams>
-  <ingest_form dsid="QDC" page="2">
-    <form_builder_method class="QtFormBuilder" file="plugins/QtFormBuilder.php" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
-    <form_elements>
-      <element label="Title/Caption/Media Name" name="dc:title" required="true" type="textfield">
-        <description>The name given to the file</description>
-      </element>
-      <element label="Creator/" name="dc:creator" type="textfield">
-        <description>An entity primarily responsible for making the
+                <ingest_method class="Ffmpeg" dsid="TN" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
+                    <parameters>
+                        <parameter name="s">92x92</parameter>
+                    </parameters>
+                </ingest_method>
+            </ingest_methods>
+        </rule>
+    </ingest_rules>
+    <datastreams>
+        <datastream dsid="OBJ">
+            <display_method class="ShowQtStreamsInFieldSets" file="plugins/qt_viewer.inc" method="showQt" module=""></display_method>
+        </datastream>
+        <datastream dsid="PROXY"></datastream>
+        <datastream dsid="OBJ_EXIFTOOL"></datastream>
+        <datastream dsid="TN"></datastream>
+        <datastream dsid="FULL_SIZE"></datastream>
+        <datastream dsid="QDC">
+            <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showQdc" module=""></display_method>
+        </datastream>
+    </datastreams>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method class="QtFormBuilder" file="plugins/QtFormBuilder.php" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
+        <form_elements>
+            <element label="Title/Caption/Media Name" name="dc:title" required="true" type="textfield">
+                <description>The name given to the file</description>
+            </element>
+            <element label="Creator/" name="dc:creator" type="textfield">
+                <description>An entity primarily responsible for making the
         content of the resource such as a person, organization or
-        service.</description>
-      </element>
-      <element label="Subject" name="dc:subject" type="select">
-        <description>An entity primarily responsible for making the
+        service.
+                </description>
+            </element>
+            <element label="Subject" name="dc:subject" type="select">
+                <description>An entity primarily responsible for making the
         content of the resource such as a person, organization or
-        service.</description>
-        <authoritative_list>
-          <item>home recording</item>
-          <item>meeting</item>
-          <item>presentation</item>
-          <item>sound</item>
-        </authoritative_list>
-      </element>
-      <element label="Description of Media" name="dc:description" required="true" type="textarea">
-        <description>Examples include an abstract, table of
+        service.
+                </description>
+                <authoritative_list>
+                    <item>home recording</item>
+                    <item>meeting</item>
+                    <item>presentation</item>
+                    <item>sound</item>
+                </authoritative_list>
+            </element>
+            <element label="Description of Media" name="dc:description" required="true" type="textarea">
+                <description>Examples include an abstract, table of
         contents, or free-text account of the content of the
-        resource.</description>
-      </element>
-      <element label="Publisher" name="dc:publisher" type="textfield">
-        <description>An entity, (including persons, organizations,
+        resource.
+                </description>
+            </element>
+            <element label="Publisher" name="dc:publisher" type="textfield">
+                <description>An entity, (including persons, organizations,
         or services), responsible for making the resource
-        available.</description>
-      </element>
-      <element label="Contributor" name="dc:contributor" type="textfield">
-        <description>An entity responsible for contributing to the
+        available.
+                </description>
+            </element>
+            <element label="Contributor" name="dc:contributor" type="textfield">
+                <description>An entity responsible for contributing to the
         content of the resource such as a person, organization or
-        service.</description>
-      </element>
-      <element label="Date" name="dc:date" type="textfield">
-        <description>Temporal scope of the content if known. Date
+        service.
+                </description>
+            </element>
+            <element label="Date" name="dc:date" type="textfield">
+                <description>Temporal scope of the content if known. Date
         format is YYYY-MM-DD (e.g. 1890,1910-10,or
-        2007-10-23)</description>
-      </element>
-      <element label="Resource Type" name="dc:type" type="select">
-        <description>Genre of the content of the resource. Examples
+        2007-10-23)
+                </description>
+            </element>
+            <element label="Resource Type" name="dc:type" type="select">
+                <description>Genre of the content of the resource. Examples
         include: home page, novel, poem, working paper, technical
-        report, essay, dictionary.</description>
-        <authoritative_list>
-          <item>none</item>
-          <item>video</item>
-          <item>event</item>
-          <item>image</item>
-          <item>interactive resource</item>
-          <item>model</item>
-          <item>party</item>
-          <item>physical object</item>
-          <item>place</item>
-          <item>service</item>
-          <item>software</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Source" name="dc:source" type="textfield">
-        <description>A reference to a resource from which the
-        present resource is derived.</description>
-      </element>
-      <element label="Identifier" name="dc:identifier" type="textfield">
-        <description>A unique reference to the resource; In this
+        report, essay, dictionary.
+                </description>
+                <authoritative_list>
+                    <item>none</item>
+                    <item>video</item>
+                    <item>event</item>
+                    <item>image</item>
+                    <item>interactive resource</item>
+                    <item>model</item>
+                    <item>party</item>
+                    <item>physical object</item>
+                    <item>place</item>
+                    <item>service</item>
+                    <item>software</item>
+                    <item>sound</item>
+                    <item>text</item>
+                </authoritative_list>
+            </element>
+            <element label="Source" name="dc:source" type="textfield">
+                <description>A reference to a resource from which the
+        present resource is derived.
+                </description>
+            </element>
+            <element label="Identifier" name="dc:identifier" type="textfield">
+                <description>A unique reference to the resource; In this
         instance, the accession number or collection
-        number.</description>
-      </element>
-      <element label="Language" name="dc:language" type="select">
-        <description>The language of the intellectual content of       
- the resource.</description>
-        <authoritative_list>
-          <item field="eng">English</item>
-          <item field="fre">French</item>
-        </authoritative_list>
-      </element>
-      <element label="Relation" name="dc:relation" type="textfield">
-        <description>Reference to a related resource.</description>
-      </element>
-      <element label="Rights Management" name="dc:rights" type="textarea">
-        <description>Information about intellectual property
+        number.
+                </description>
+            </element>
+            <element label="Language" name="dc:language" type="select">
+                <description>The language of the intellectual content of
+ the resource.
+                </description>
+                <authoritative_list>
+                    <item field="eng">English</item>
+                    <item field="fre">French</item>
+                </authoritative_list>
+            </element>
+            <element label="Relation" name="dc:relation" type="textfield">
+                <description>Reference to a related resource.</description>
+            </element>
+            <element label="Rights Management" name="dc:rights" type="textarea">
+                <description>Information about intellectual property
         rights, copyright, and various property
-        rights.</description>
-      </element>
-    </form_elements>
-  </ingest_form>
+        rights.
+                </description>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>
 

content_models/STRICT_PDFCM.xml

@@ -1,107 +1,108 @@
+
 <content_model name="strict_pdf" xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
-  <mimetypes>
-    <type>application/pdf</type>
-  </mimetypes>
-  <ingest_rules>
-    <rule>
-      <applies_to>application/pdf</applies_to>
-      <ingest_methods>
-        <ingest_method class="ImageManipulation" dsid="TN" file="plugins/ImageManipulation.inc"
+    <mimetypes>
+        <type>application/pdf</type>
+    </mimetypes>
+    <ingest_rules>
+        <rule>
+            <applies_to>application/pdf</applies_to>
+            <ingest_methods>
+                <ingest_method class="ImageManipulation" dsid="TN" file="plugins/ImageManipulation.inc"
           method="createThumbnailFromPDF" modified_files_ext="jpg" module="">
-          <parameters>
-            <parameter name="width">100</parameter>
-            <parameter name="height">120</parameter>
-          </parameters>
-        </ingest_method>
-      </ingest_methods>
-    </rule>
-  </ingest_rules>
-  <datastreams>
-    <datastream dsid="TN">
-      <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showPDFPreview" module=""/>
-    </datastream>
-    <datastream dsid="OBJ">
-      <add_datastream_method class="ImageManipulation" dsid="TN" file="plugins/ImageManipulation.inc"
+                    <parameters>
+                        <parameter name="width">100</parameter>
+                        <parameter name="height">120</parameter>
+                    </parameters>
+                </ingest_method>
+            </ingest_methods>
+        </rule>
+    </ingest_rules>
+    <datastreams>
+        <datastream dsid="TN">
+            <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showPDFPreview" module=""/>
+        </datastream>
+        <datastream dsid="OBJ">
+            <add_datastream_method class="ImageManipulation" dsid="TN" file="plugins/ImageManipulation.inc"
         method="createThumbnailFromPDF" modified_files_ext="jpg" module="">
-        <parameters>
-          <parameter name="width">100</parameter>
-          <parameter name="height">120</parameter>
-        </parameters>
-      </add_datastream_method>
-    </datastream>
-  </datastreams>
-  <ingest_form dsid="QDC" page="2">
-    <form_builder_method class="FormBuilder" file="plugins/FormBuilder.inc" handler="handleQDCForm"
+                <parameters>
+                    <parameter name="width">100</parameter>
+                    <parameter name="height">120</parameter>
+                </parameters>
+            </add_datastream_method>
+        </datastream>
+    </datastreams>
+    <ingest_form dsid="QDC" page="2">
+        <form_builder_method class="FormBuilder" file="plugins/FormBuilder.inc" handler="handleQDCForm"
       method="buildQDCForm" module=""/>
-    <form_elements>
-      <element label="Title/Caption/Object Name" name="dc:title" required="true" type="textfield">
-        <description>The name given to the resource</description>
-      </element>
-      <element label="Creator/Photographer/Author" name="dc:creator" type="textfield">
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-      </element>
-      <element label="Subject" name="dc:subject" type="select">
-        <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-        <authoritative_list>
-          <item>experiment session</item>
-          <item>home recording</item>
-          <item>image</item>
-          <item>meeting</item>
-          <item>presentation</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Description" name="dc:description" required="true" type="textarea">
-        <description>Examples include an abstract, table of contents, or free-text account of the content of the resource.</description>
-      </element>
-      <element label="Publisher" name="dc:publisher" type="textfield">
-        <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
-      </element>
-      <element label="Contributor" name="dc:contributor" type="textfield">
-        <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
-      </element>
-      <element label="Date" name="dc:date" type="textfield">
-        <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
-      </element>
-      <element label="Resource Type" name="dc:type" type="select">
-        <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
-        <authoritative_list>
-          <item>none</item>
-          <item>collection</item>
-          <item>dataset</item>
-          <item>event</item>
-          <item>image</item>
-          <item>interactive resource</item>
-          <item>model</item>
-          <item>party</item>
-          <item>physical object</item>
-          <item>place</item>
-          <item>service</item>
-          <item>software</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Source" name="dc:source" type="textfield">
-        <description>A reference to a resource from which the present resource is derived.</description>
-      </element>
-      <element label="Identifier" name="dc:identifier" type="textfield">
-        <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
-      </element>
-      <element label="Language" name="dc:language" type="select">
-        <description>The language of the intellectual content of the resource.</description>
-        <authoritative_list>
-          <item field="eng">English</item>
-          <item field="fre">French</item>
-        </authoritative_list>
-      </element>
-      <element label="Relation" name="dc:relation" type="textfield">
-        <description>Reference to a related resource.</description>
-      </element>
-      <element label="Rights Management" name="dc:rights" type="textarea">
-        <description>Information about intellectual property rights, copyright, and various property rights.</description>
-      </element>
-    </form_elements>
-  </ingest_form>
+        <form_elements>
+            <element label="Title/Caption/Object Name" name="dc:title" required="true" type="textfield">
+                <description>The name given to the resource</description>
+            </element>
+            <element label="Creator/Photographer/Author" name="dc:creator" type="textfield">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Subject" name="dc:subject" type="select">
+                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+                <authoritative_list>
+                    <item>experiment session</item>
+                    <item>home recording</item>
+                    <item>image</item>
+                    <item>meeting</item>
+                    <item>presentation</item>
+                    <item>sound</item>
+                    <item>text</item>
+                </authoritative_list>
+            </element>
+            <element label="Description" name="dc:description" required="true" type="textarea">
+                <description>Examples include an abstract, table of contents, or free-text account of the content of the resource.</description>
+            </element>
+            <element label="Publisher" name="dc:publisher" type="textfield">
+                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+            </element>
+            <element label="Contributor" name="dc:contributor" type="textfield">
+                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+            </element>
+            <element label="Date" name="dc:date" type="textfield">
+                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+            </element>
+            <element label="Resource Type" name="dc:type" type="select">
+                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+                <authoritative_list>
+                    <item>none</item>
+                    <item>collection</item>
+                    <item>dataset</item>
+                    <item>event</item>
+                    <item>image</item>
+                    <item>interactive resource</item>
+                    <item>model</item>
+                    <item>party</item>
+                    <item>physical object</item>
+                    <item>place</item>
+                    <item>service</item>
+                    <item>software</item>
+                    <item>sound</item>
+                    <item>text</item>
+                </authoritative_list>
+            </element>
+            <element label="Source" name="dc:source" type="textfield">
+                <description>A reference to a resource from which the present resource is derived.</description>
+            </element>
+            <element label="Identifier" name="dc:identifier" type="textfield">
+                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+            </element>
+            <element label="Language" name="dc:language" type="select">
+                <description>The language of the intellectual content of the resource.</description>
+                <authoritative_list>
+                    <item field="eng">English</item>
+                    <item field="fre">French</item>
+                </authoritative_list>
+            </element>
+            <element label="Relation" name="dc:relation" type="textfield">
+                <description>Reference to a related resource.</description>
+            </element>
+            <element label="Rights Management" name="dc:rights" type="textarea">
+                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+            </element>
+        </form_elements>
+    </ingest_form>
 </content_model>

content_models/demo_Collection.xml

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:Collection" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Definition Object (Collection) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.712Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Definition Object (Collection) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.712Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:20.712Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:20.712Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_Collection.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="432">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Service Definition Object (Collection) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:Collection</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Service Definition Object (Collection) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:Collection</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="404">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:Collection">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:Collection">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.125Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP1.0" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="401">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="MethodMap - Collection of Objects" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationLabel="An xml list of members in the collection" operationName="list"/>
-          <fmm:Method operationLabel="An html representation of the collection" operationName="view"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <fmm:MethodMap name="MethodMap - Collection of Objects" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationLabel="An xml list of members in the collection" operationName="list"/>
+                    <fmm:Method operationLabel="An html representation of the collection" operationName="view"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/demo_CollectionImpl.xml

@@ -1,196 +1,196 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:CollectionImpl" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Deployment Object (Collection) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.819Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Deployment Object (Collection) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.819Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:20.819Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:20.819Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_CollectionImpl.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="494">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Service Deployment Object (Collection) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:ImageCollectionImpl</dc:identifier>
-          <dc:identifier>demo:CollectionImpl</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Service Deployment Object (Collection) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:ImageCollectionImpl</dc:identifier>
+                    <dc:identifier>demo:CollectionImpl</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.1" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="674">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:CollectionImpl">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
-            <fedora-model:isDeploymentOf rdf:resource="info:fedora/demo:Collection"/>
-            <fedora-model:isContractorOf rdf:resource="info:fedora/demo:DualResImageCollection"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:CollectionImpl">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
+                        <fedora-model:isDeploymentOf rdf:resource="info:fedora/demo:Collection"/>
+                        <fedora-model:isContractorOf rdf:resource="info:fedora/demo:DualResImageCollection"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP1.0" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="1948">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="MethodMap - Image Collection" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationLabel="An html representation of the collection" operationName="view"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="MethodMap - Image Collection" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationLabel="An html representation of the collection" operationName="view"
             wsdlMsgName="viewRequest" wsdlMsgOutput="dissemResponse">
-            <fmm:DatastreamInputParm label="Stylesheet to transform LIST into html" parmName="XSLT" passBy="URL_REF" required="true"/>
-            <fmm:DatastreamInputParm label="The result of the list dissemination as a datastream" parmName="LIST"
+                        <fmm:DatastreamInputParm label="Stylesheet to transform LIST into html" parmName="XSLT" passBy="URL_REF" required="true"/>
+                        <fmm:DatastreamInputParm label="The result of the list dissemination as a datastream" parmName="LIST"
               passBy="URL_REF" required="true"/>
-            <fmm:DefaultInputParm defaultValue="yes" label="Whether to reload the stylesheet each time"
+                        <fmm:DefaultInputParm defaultValue="yes" label="Whether to reload the stylesheet each time"
               parmName="CLEAR_CACHE" passBy="VALUE" required="true"/>
-            <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="text/html"/>
-          </fmm:Method>
-          <fmm:Method operationLabel="An xml list of members in the collection" operationName="list"
+                        <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="text/html"/>
+                    </fmm:Method>
+                    <fmm:Method operationLabel="An xml list of members in the collection" operationName="list"
             wsdlMsgName="listRequest" wsdlMsgOutput="dissemResponse">
-            <fmm:DatastreamInputParm defaultValue="" label="" parmName="QUERY" passBy="URL_REF" required="true"/>
-            <fmm:DefaultInputParm defaultValue="tuples" label="" parmName="TYPE" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="itql" label="" parmName="LANG" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="Sparql" label="" parmName="FORMAT" passBy="VALUE" required="true"/>
-            <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="text/xml"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2004-12-17T15:32:11.000Z"
+                        <fmm:DatastreamInputParm defaultValue="" label="" parmName="QUERY" passBy="URL_REF" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="tuples" label="" parmName="TYPE" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="itql" label="" parmName="LANG" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="Sparql" label="" parmName="FORMAT" passBy="VALUE" required="true"/>
+                        <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="text/xml"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2004-12-17T15:32:11.000Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC1.0"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="1194">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="Datastream Input Specification for Image Collection" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="XSLT">
-            <fbs:DSInputLabel>XSLT Binding</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="LIST">
-            <fbs:DSInputLabel>LIST Binding</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="QUERY">
-            <fbs:DSInputLabel>QUERY Binding</fbs:DSInputLabel>
-            <fbs:DSMIME>text/plain</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="Datastream Input Specification for Image Collection" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="XSLT">
+                        <fbs:DSInputLabel>XSLT Binding</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="LIST">
+                        <fbs:DSInputLabel>LIST Binding</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="QUERY">
+                        <fbs:DSInputLabel>QUERY Binding</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/plain</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.171Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL1.0" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="5242">
-      <foxml:xmlContent>
-        <wsdl:definitions name="ImageCollection" targetNamespace="bmech"
+            <foxml:xmlContent>
+                <wsdl:definitions name="ImageCollection" targetNamespace="bmech"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="bmech"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:types>
-            <xsd:schema targetNamespace="bmech">
-              <xsd:simpleType name="TYPEType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="QUERYType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="XSLTType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="LANGType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="LISTType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="CLEAR_CACHEType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="FORMATType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-            </xsd:schema>
-          </wsdl:types>
-          <wsdl:message name="viewRequest">
-            <wsdl:part name="XSLT" type="this:XSLTType"/>
-            <wsdl:part name="LIST" type="this:LISTType"/>
-            <wsdl:part name="CLEAR_CACHE" type="this:CLEAR_CACHEType"/>
-          </wsdl:message>
-          <wsdl:message name="listRequest">
-            <wsdl:part name="TYPE" type="this:TYPEType"/>
-            <wsdl:part name="QUERY" type="this:QUERYType"/>
-            <wsdl:part name="LANG" type="this:LANGType"/>
-            <wsdl:part name="FORMAT" type="this:FORMATType"/>
-          </wsdl:message>
-          <wsdl:message name="dissemResponse">
-            <wsdl:part name="dissem" type="xsd:base64Binary"/>
-          </wsdl:message>
-          <wsdl:portType name="ImageCollectionPortType">
-            <wsdl:operation name="view">
-              <wsdl:input message="this:viewRequest"/>
-              <wsdl:output message="this:dissemResponse"/>
-            </wsdl:operation>
-            <wsdl:operation name="list">
-              <wsdl:input message="this:listRequest"/>
-              <wsdl:output message="this:dissemResponse"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="ImageCollection">
-            <wsdl:port binding="this:ImageCollection_http" name="ImageCollection_port">
-              <http:address location="LOCAL"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="ImageCollection_http" type="this:ImageCollectionPortType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="view">
-              <http:operation location="http://local.fedora.server/saxon/SaxonServlet?source=(LIST)&amp;style=(XSLT)&amp;clear-stylesheet-cache=(CLEAR_CACHE)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/html"/>
-              </wsdl:output>
-            </wsdl:operation>
-            <wsdl:operation name="list">
-              <http:operation location="http://local.fedora.server/fedora/risearch?type=(TYPE)&amp;lang=(LANG)&amp;format=(FORMAT)&amp;query=(QUERY)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/xml"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <wsdl:types>
+                        <xsd:schema targetNamespace="bmech">
+                            <xsd:simpleType name="TYPEType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="QUERYType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="XSLTType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="LANGType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="LISTType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="CLEAR_CACHEType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="FORMATType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                        </xsd:schema>
+                    </wsdl:types>
+                    <wsdl:message name="viewRequest">
+                        <wsdl:part name="XSLT" type="this:XSLTType"/>
+                        <wsdl:part name="LIST" type="this:LISTType"/>
+                        <wsdl:part name="CLEAR_CACHE" type="this:CLEAR_CACHEType"/>
+                    </wsdl:message>
+                    <wsdl:message name="listRequest">
+                        <wsdl:part name="TYPE" type="this:TYPEType"/>
+                        <wsdl:part name="QUERY" type="this:QUERYType"/>
+                        <wsdl:part name="LANG" type="this:LANGType"/>
+                        <wsdl:part name="FORMAT" type="this:FORMATType"/>
+                    </wsdl:message>
+                    <wsdl:message name="dissemResponse">
+                        <wsdl:part name="dissem" type="xsd:base64Binary"/>
+                    </wsdl:message>
+                    <wsdl:portType name="ImageCollectionPortType">
+                        <wsdl:operation name="view">
+                            <wsdl:input message="this:viewRequest"/>
+                            <wsdl:output message="this:dissemResponse"/>
+                        </wsdl:operation>
+                        <wsdl:operation name="list">
+                            <wsdl:input message="this:listRequest"/>
+                            <wsdl:output message="this:dissemResponse"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="ImageCollection">
+                        <wsdl:port binding="this:ImageCollection_http" name="ImageCollection_port">
+                            <http:address location="LOCAL"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="ImageCollection_http" type="this:ImageCollectionPortType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="view">
+                            <http:operation location="http://local.fedora.server/saxon/SaxonServlet?source=(LIST)&amp;style=(XSLT)&amp;clear-stylesheet-cache=(CLEAR_CACHE)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/html"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                        <wsdl:operation name="list">
+                            <http:operation location="http://local.fedora.server/fedora/risearch?type=(TYPE)&amp;lang=(LANG)&amp;format=(FORMAT)&amp;query=(QUERY)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/xml"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/demo_DualResImage.xml

@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:DualResImage" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Content Model Object (Image) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2007-08-15T14:36:32.085Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:19.456Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2007-08-15T14:36:32.085Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Content Model Object (Image) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2007-08-15T14:36:32.085Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:19.456Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2007-08-15T14:36:32.085Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:19.456Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.890Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:19.456Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImage.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.890Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="424">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Content Model Object (Image) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:DualResImage</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.890Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Content Model Object (Image) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:DualResImage</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.890Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="472">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:DualResImage">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
-            <fedora-model:hasService rdf:resource="info:fedora/demo:DualResolution"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2007-08-15T14:36:30.369Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:DualResImage">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
+                        <fedora-model:hasService rdf:resource="info:fedora/demo:DualResolution"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2007-08-15T14:36:30.369Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSCompositeModel-1.0" ID="DS-COMPOSITE-MODEL1.0"
       LABEL="Datastream Composite Model" MIMETYPE="text/xml" SIZE="651">
-      <foxml:xmlContent>
-        <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
-          <dsTypeModel ID="DC">
-            <form FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" MIME="text/xml"/>
-          </dsTypeModel>
-          <dsTypeModel ID="RELS-EXT">
-            <form FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" MIME="application/rdf+xml"/>
-          </dsTypeModel>
-          <dsTypeModel ID="MEDIUM_SIZE">
-            <form MIME="image/jpeg"/>
-          </dsTypeModel>
-          <dsTypeModel ID="FULL_SIZE">
-            <form MIME="image/jpeg"/>
-          </dsTypeModel>
-        </dsCompositeModel>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
+                    <dsTypeModel ID="DC">
+                        <form FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" MIME="text/xml"/>
+                    </dsTypeModel>
+                    <dsTypeModel ID="RELS-EXT">
+                        <form FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" MIME="application/rdf+xml"/>
+                    </dsTypeModel>
+                    <dsTypeModel ID="MEDIUM_SIZE">
+                        <form MIME="image/jpeg"/>
+                    </dsTypeModel>
+                    <dsTypeModel ID="FULL_SIZE">
+                        <form MIME="image/jpeg"/>
+                    </dsTypeModel>
+                </dsCompositeModel>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/demo_DualResImageCollection.xml

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:DualResImageCollection" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Content Model Object (Image Collection) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2007-08-15T14:36:34.682Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:19.509Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2007-08-15T14:36:34.682Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Content Model Object (Image Collection) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2007-08-15T14:36:34.682Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:19.509Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2007-08-15T14:36:34.682Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:19.509Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:19.509Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/cModelObjects/demo_DualResImageCollection.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="445">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Content Model Object (Image Collection) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:DualResImageCollection</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.906Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Content Model Object (Image Collection) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:DualResImageCollection</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.906Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="478">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:DualResImageCollection">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
-            <fedora-model:hasService rdf:resource="info:fedora/demo:Collection"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2007-08-15T14:36:30.369Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:DualResImageCollection">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
+                        <fedora-model:hasService rdf:resource="info:fedora/demo:Collection"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2007-08-15T14:36:30.369Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSCompositeModel-1.0" ID="DS-COMPOSITE-MODEL1.0"
       LABEL="Datastream Composite Model" MIMETYPE="text/xml" SIZE="410">
-      <foxml:xmlContent>
-        <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
-          <dsTypeModel ID="QUERY">
-            <form MIME="text/plain"/>
-          </dsTypeModel>
-          <dsTypeModel ID="XSLT">
-            <form MIME="text/xml"/>
-          </dsTypeModel>
-          <dsTypeModel ID="LIST">
-            <form MIME="text/xml"/>
-          </dsTypeModel>
-        </dsCompositeModel>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
+                    <dsTypeModel ID="QUERY">
+                        <form MIME="text/plain"/>
+                    </dsTypeModel>
+                    <dsTypeModel ID="XSLT">
+                        <form MIME="text/xml"/>
+                    </dsTypeModel>
+                    <dsTypeModel ID="LIST">
+                        <form MIME="text/xml"/>
+                    </dsTypeModel>
+                </dsCompositeModel>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/demo_DualResImageImpl.xml

@@ -1,162 +1,162 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:DualResImageImpl" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Deployment Object (Image) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.881Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Deployment Object (Image) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.881Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:20.881Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:20.881Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDepObjects/demo_DualResImageImpl.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="433">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Service Deployment Object (Image) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:DualResImageImpl</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Service Deployment Object (Image) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:DualResImageImpl</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.1" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="670">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:DualResImageImpl">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
-            <fedora-model:isDeploymentOf rdf:resource="info:fedora/demo:DualResolution"/>
-            <fedora-model:isContractorOf rdf:resource="info:fedora/demo:DualResImage"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:DualResImageImpl">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
+                        <fedora-model:isDeploymentOf rdf:resource="info:fedora/demo:DualResolution"/>
+                        <fedora-model:isContractorOf rdf:resource="info:fedora/demo:DualResImage"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP1.0" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="1152">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="MethodMap - Dual Resolution Image Implementation" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationLabel="A full-size image" operationName="fullSize" wsdlMsgName="fullSizeRequest" wsdlMsgOutput="dissemResponse">
-            <fmm:DatastreamInputParm defaultValue="" label="The full-size image" parmName="FULL_SIZE" passBy="URL_REF" required="true"/>
-            <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="image/jpeg"/>
-          </fmm:Method>
-          <fmm:Method operationLabel="A medium-size image" operationName="mediumSize" wsdlMsgName="mediumSizeRequest" wsdlMsgOutput="dissemResponse">
-            <fmm:DatastreamInputParm defaultValue="" label="The medium-size image" parmName="MEDIUM_SIZE"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="MethodMap - Dual Resolution Image Implementation" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationLabel="A full-size image" operationName="fullSize" wsdlMsgName="fullSizeRequest" wsdlMsgOutput="dissemResponse">
+                        <fmm:DatastreamInputParm defaultValue="" label="The full-size image" parmName="FULL_SIZE" passBy="URL_REF" required="true"/>
+                        <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="image/jpeg"/>
+                    </fmm:Method>
+                    <fmm:Method operationLabel="A medium-size image" operationName="mediumSize" wsdlMsgName="mediumSizeRequest" wsdlMsgOutput="dissemResponse">
+                        <fmm:DatastreamInputParm defaultValue="" label="The medium-size image" parmName="MEDIUM_SIZE"
               passBy="URL_REF" required="true"/>
-            <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="image/jpeg"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z"
+                        <fmm:MethodReturnType wsdlMsgName="dissemResponse" wsdlMsgTOMIME="image/jpeg"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC1.0"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="899">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="Datastream Input Specification for Dual Resolution Image Implementation" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="FULL_SIZE">
-            <fbs:DSInputLabel>FULL_SIZE Binding</fbs:DSInputLabel>
-            <fbs:DSMIME>image/jpeg</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="MEDIUM_SIZE">
-            <fbs:DSInputLabel>MEDIUM_SIZE Binding</fbs:DSInputLabel>
-            <fbs:DSMIME>image/jpeg</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="Datastream Input Specification for Dual Resolution Image Implementation" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="FULL_SIZE">
+                        <fbs:DSInputLabel>FULL_SIZE Binding</fbs:DSInputLabel>
+                        <fbs:DSMIME>image/jpeg</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="MEDIUM_SIZE">
+                        <fbs:DSInputLabel>MEDIUM_SIZE Binding</fbs:DSInputLabel>
+                        <fbs:DSMIME>image/jpeg</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.203Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL1.0" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="3744">
-      <foxml:xmlContent>
-        <wsdl:definitions name="DualResolutionImageImplementation" targetNamespace="bmech"
+            <foxml:xmlContent>
+                <wsdl:definitions name="DualResolutionImageImplementation" targetNamespace="bmech"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="bmech"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:types>
-            <xsd:schema targetNamespace="bmech">
-              <xsd:simpleType name="FULL_SIZEType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-              <xsd:simpleType name="MEDIUM_SIZEType">
-                <xsd:restriction base="xsd:string"/>
-              </xsd:simpleType>
-            </xsd:schema>
-          </wsdl:types>
-          <wsdl:message name="fullSizeRequest">
-            <wsdl:part name="FULL_SIZE" type="this:FULL_SIZEType"/>
-          </wsdl:message>
-          <wsdl:message name="mediumSizeRequest">
-            <wsdl:part name="MEDIUM_SIZE" type="this:MEDIUM_SIZEType"/>
-          </wsdl:message>
-          <wsdl:message name="dissemResponse">
-            <wsdl:part name="dissem" type="xsd:base64Binary"/>
-          </wsdl:message>
-          <wsdl:portType name="DualResImageImplPortType">
-            <wsdl:operation name="fullSize">
-              <wsdl:input message="this:fullSizeRequest"/>
-              <wsdl:output message="this:dissemResponse"/>
-            </wsdl:operation>
-            <wsdl:operation name="mediumSize">
-              <wsdl:input message="this:mediumSizeRequest"/>
-              <wsdl:output message="this:dissemResponse"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="DualResImageImpl">
-            <wsdl:port binding="this:DualResImageImpl_http" name="DualResImageImpl_port">
-              <http:address location="LOCAL"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="DualResImageImpl_http" type="this:DualResImageImplPortType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="fullSize">
-              <http:operation location="(FULL_SIZE)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="image/jpeg"/>
-              </wsdl:output>
-            </wsdl:operation>
-            <wsdl:operation name="mediumSize">
-              <http:operation location="(MEDIUM_SIZE)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="image/jpeg"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <wsdl:types>
+                        <xsd:schema targetNamespace="bmech">
+                            <xsd:simpleType name="FULL_SIZEType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                            <xsd:simpleType name="MEDIUM_SIZEType">
+                                <xsd:restriction base="xsd:string"/>
+                            </xsd:simpleType>
+                        </xsd:schema>
+                    </wsdl:types>
+                    <wsdl:message name="fullSizeRequest">
+                        <wsdl:part name="FULL_SIZE" type="this:FULL_SIZEType"/>
+                    </wsdl:message>
+                    <wsdl:message name="mediumSizeRequest">
+                        <wsdl:part name="MEDIUM_SIZE" type="this:MEDIUM_SIZEType"/>
+                    </wsdl:message>
+                    <wsdl:message name="dissemResponse">
+                        <wsdl:part name="dissem" type="xsd:base64Binary"/>
+                    </wsdl:message>
+                    <wsdl:portType name="DualResImageImplPortType">
+                        <wsdl:operation name="fullSize">
+                            <wsdl:input message="this:fullSizeRequest"/>
+                            <wsdl:output message="this:dissemResponse"/>
+                        </wsdl:operation>
+                        <wsdl:operation name="mediumSize">
+                            <wsdl:input message="this:mediumSizeRequest"/>
+                            <wsdl:output message="this:dissemResponse"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="DualResImageImpl">
+                        <wsdl:port binding="this:DualResImageImpl_http" name="DualResImageImpl_port">
+                            <http:address location="LOCAL"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="DualResImageImpl_http" type="this:DualResImageImplPortType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="fullSize">
+                            <http:operation location="(FULL_SIZE)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="image/jpeg"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                        <wsdl:operation name="mediumSize">
+                            <http:operation location="(MEDIUM_SIZE)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="image/jpeg"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/demo_DualResolution.xml

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="demo:DualResolution" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Definition Object (Image) for Image Collection Demo"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.765Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Service Definition Object (Image) for Image Collection Demo"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2008-07-02T05:09:42.015Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2011-03-29T14:15:20.765Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:42.015Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2011-03-29T14:15:20.765Z</audit:date>
-            <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2011-03-29T14:15:20.765Z</audit:date>
+                        <audit:justification>Ingested from local file /usr/local/fedora/client/demo/foxml/local-server-demos/image-collection-demo/sDefObjects/demo_DualResolution.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="431">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Service Definition Object (Image) for Image Collection Demo</dc:title>
-          <dc:identifier>demo:DualResolution</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <dc:title>Service Definition Object (Image) for Image Collection Demo</dc:title>
+                    <dc:identifier>demo:DualResolution</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="408">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/demo:DualResolution">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/demo:DualResolution">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2008-07-02T05:09:43.156Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP1.0" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="367">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="MethodMap - Dual Resolution Image" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationLabel="A full-size image" operationName="fullSize"/>
-          <fmm:Method operationLabel="A medium-size image" operationName="mediumSize"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <fmm:MethodMap name="MethodMap - Dual Resolution Image" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationLabel="A full-size image" operationName="fullSize"/>
+                    <fmm:Method operationLabel="A medium-size image" operationName="mediumSize"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_jp2Sdef.xml

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:jp2Sdef" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:jp2Sdef"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:14.106Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:jp2Sdef"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:14.106Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T14:56:59.840Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_jp2Sdef.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-05-25T13:17:14.106Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T14:56:59.840Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_jp2Sdef.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-05-25T13:17:14.106Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="363">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:jp2Sdef">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:jp2Sdef">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="381">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:jp2Sdef</dc:title>
-          <dc:identifier>ilives:jp2Sdef</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
+                    <dc:title>ilives:jp2Sdef</dc:title>
+                    <dc:identifier>ilives:jp2Sdef</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP.3" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="245">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="getMetadata"/>
-          <fmm:Method operationName="getRegion"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="getMetadata"/>
+                    <fmm:Method operationName="getRegion"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_jp2Sdep-pageCModel.xml

@@ -1,179 +1,179 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:jp2Sdep-pageCModel" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:jp2Sdep-pageCModel"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-21T03:24:05.906Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:48:39.302Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:jp2Sdep-pageCModel"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-21T03:24:05.906Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:48:39.302Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T14:57:00.246Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_jp2Sdep-pageCModel.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-06-01T00:46:19.239Z</audit:date>
-            <audit:justification>Ingested from local file /Users/al/Desktop/ilives_jp2Sdep-pageCModel.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-06-01T00:48:39.302Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T14:57:00.246Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_jp2Sdep-pageCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-06-01T00:46:19.239Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/al/Desktop/ilives_jp2Sdep-pageCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-06-01T00:48:39.302Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="403">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:jp2Sdep-pageCModel</dc:title>
-          <dc:identifier>ilives:jp2Sdep-pageCModel</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:26:21.830Z"
+                    <dc:title>ilives:jp2Sdep-pageCModel</dc:title>
+                    <dc:identifier>ilives:jp2Sdep-pageCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:26:21.830Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP.1" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="2498">
-      <foxml:xmlContent>
-        <fmm:MethodMap bDefPID="djatoka:bDef" name="MethodMap - djatoka Service Methods" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="getMetadata" wsdlMsgName="getMetadataRequest" wsdlMsgOutput="response">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getMetadata" parmName="svc_id" passBy="VALUE" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="application/json"/>
-          </fmm:Method>
-          <fmm:Method operationName="getRegion" wsdlMsgName="getRegionRequest" wsdlMsgOutput="response">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getRegion" parmName="svc_id" passBy="VALUE" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="" parmName="region" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="0" parmName="rotate" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="-1" parmName="level" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="" parmName="scale" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="" parmName="clayers" passBy="VALUE" required="false"/>
-            <fmm:UserInputParm defaultValue="image/jpeg" parmName="format" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="image/jpeg"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:26:44.151Z"
+            <foxml:xmlContent>
+                <fmm:MethodMap bDefPID="djatoka:bDef" name="MethodMap - djatoka Service Methods" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="getMetadata" wsdlMsgName="getMetadataRequest" wsdlMsgOutput="response">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getMetadata" parmName="svc_id" passBy="VALUE" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="application/json"/>
+                    </fmm:Method>
+                    <fmm:Method operationName="getRegion" wsdlMsgName="getRegionRequest" wsdlMsgOutput="response">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getRegion" parmName="svc_id" passBy="VALUE" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="" parmName="region" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="0" parmName="rotate" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="-1" parmName="level" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="" parmName="scale" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="" parmName="clayers" passBy="VALUE" required="false"/>
+                        <fmm:UserInputParm defaultValue="image/jpeg" parmName="format" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="image/jpeg"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:26:44.151Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC.1"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="401">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="jp2SdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
-            <fbs:DSInputLabel>DC</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:27:46.103Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="jp2SdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
+                        <fbs:DSInputLabel>DC</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:27:46.103Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.1" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="3258">
-      <foxml:xmlContent>
-        <wsdl:definitions name="Fedora Local Djatoka Service" targetNamespace="jp2SDep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="Fedora Local Djatoka Service" targetNamespace="jp2SDep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="djatoka"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="getMetadataRequest">
-            <wsdl:part name="PID" type="xsd:string"/>
-            <wsdl:part name="DSID" type="xsd:string"/>
-            <wsdl:part name="svc_id" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="getRegionRequest">
-            <wsdl:part name="PID" type="xsd:string"/>
-            <wsdl:part name="DSID" type="xsd:string"/>
-            <wsdl:part name="svc_id" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="response">
-            <wsdl:part name="exhibit" type="xsd:base64Binary"/>
-          </wsdl:message>
-          <wsdl:portType name="FedoraDjatokaPortType">
-            <wsdl:operation name="getMetadata">
-              <wsdl:input message="this:getMetadataRequest"/>
-              <wsdl:output message="this:response"/>
-            </wsdl:operation>
-            <wsdl:operation name="getRegion">
-              <wsdl:input message="this:getRegionRequest"/>
-              <wsdl:output message="this:response"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="FedoraDjatoka">
-            <wsdl:port binding="this:FedoraDjatoka_http" name="FedoraDjatoka_port">
-              <http:address location="http://local.fedora.server/"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="FedoraDjatoka_http" type="this:FedoraDjatokaPortType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="getMetadata">
-              <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="application/json"/>
-              </wsdl:output>
-            </wsdl:operation>
-            <wsdl:operation name="getRegion">
-              <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)&amp;svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg2000&amp;svc.format=(format)&amp;svc.level=(level)&amp;svc.rotate=(rotate)&amp;svc.region=(region)&amp;svc.scale=(scale)&amp;svc.clayers=(clayers)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="image/jpeg"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-06-01T00:48:39.302Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <wsdl:message name="getMetadataRequest">
+                        <wsdl:part name="PID" type="xsd:string"/>
+                        <wsdl:part name="DSID" type="xsd:string"/>
+                        <wsdl:part name="svc_id" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="getRegionRequest">
+                        <wsdl:part name="PID" type="xsd:string"/>
+                        <wsdl:part name="DSID" type="xsd:string"/>
+                        <wsdl:part name="svc_id" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="response">
+                        <wsdl:part name="exhibit" type="xsd:base64Binary"/>
+                    </wsdl:message>
+                    <wsdl:portType name="FedoraDjatokaPortType">
+                        <wsdl:operation name="getMetadata">
+                            <wsdl:input message="this:getMetadataRequest"/>
+                            <wsdl:output message="this:response"/>
+                        </wsdl:operation>
+                        <wsdl:operation name="getRegion">
+                            <wsdl:input message="this:getRegionRequest"/>
+                            <wsdl:output message="this:response"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="FedoraDjatoka">
+                        <wsdl:port binding="this:FedoraDjatoka_http" name="FedoraDjatoka_port">
+                            <http:address location="http://local.fedora.server/"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="FedoraDjatoka_http" type="this:FedoraDjatokaPortType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="getMetadata">
+                            <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="application/json"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                        <wsdl:operation name="getRegion">
+                            <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)&amp;svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg2000&amp;svc.format=(format)&amp;svc.level=(level)&amp;svc.rotate=(rotate)&amp;svc.region=(region)&amp;svc.scale=(scale)&amp;svc.clayers=(clayers)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="image/jpeg"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-06-01T00:48:39.302Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.2" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="688">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:jp2Sdep-pageCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:jp2Sdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/ilives:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/newspapers:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:jp2Sdep-pageCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:jp2Sdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/ilives:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/newspapers:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_tei2htmlSdef.xml

@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:tei2htmlSdef" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:tei2htmlSdef"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:46:19.652Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:tei2htmlSdef"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:46:19.652Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T14:57:01.057Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_tei2htmlSdef.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-06-01T00:46:19.652Z</audit:date>
-            <audit:justification>Ingested from local file /Users/al/Desktop/ilives_tei2htmlSdef.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T14:57:01.057Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_tei2htmlSdef.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-06-01T00:46:19.652Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/al/Desktop/ilives_tei2htmlSdef.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="368">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:tei2htmlSdef">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:tei2htmlSdef">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="391">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:tei2htmlSdef</dc:title>
-          <dc:identifier>ilives:tei2htmlSdef</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
+                    <dc:title>ilives:tei2htmlSdef</dc:title>
+                    <dc:identifier>ilives:tei2htmlSdef</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP.3" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="180">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="tei2html"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="tei2html"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_tei2htmlSdep-pageCModel.xml

@@ -1,234 +1,241 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:tei2htmlSdep-pageCModel" VERSION="1.1"
   xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:tei2htmlSdep-pageCModel"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-21T03:24:05.906Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:46:19.847Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:tei2htmlSdep-pageCModel"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-21T03:24:05.906Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T00:46:19.847Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T14:57:01.366Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_tei2htmlSdep-pageCModel.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>XSL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-12-11T19:09:52.417Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>XSL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-12-11T19:22:11.096Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-06-01T00:46:19.847Z</audit:date>
-            <audit:justification>Ingested from local file /Users/al/Desktop/ilives_tei2htmlSdep-pageCModel.xml</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:25:04.961Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T14:57:01.366Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_tei2htmlSdep-pageCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>XSL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-12-11T19:09:52.417Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>XSL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-12-11T19:22:11.096Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-06-01T00:46:19.847Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/al/Desktop/ilives_tei2htmlSdep-pageCModel.xml</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:25:04.961Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.1" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="614">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:tei2htmlSdep-pageCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:tei2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/ilives:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:tei2htmlSdep-pageCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:tei2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/ilives:pageCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-05-21T03:24:05.906Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="413">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:tei2htmlSdep-pageCModel</dc:title>
-          <dc:identifier>ilives:tei2htmlSdep-pageCModel</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-09-17T02:47:11.226Z"
+                    <dc:title>ilives:tei2htmlSdep-pageCModel</dc:title>
+                    <dc:identifier>ilives:tei2htmlSdep-pageCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-09-17T02:47:11.226Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC.3"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="718">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="tei2htmlSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="TEI">
-            <fbs:DSInputLabel>TEI</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" pid="ilives:tei2htmlSdep-pageCModel" wsdlMsgPartName="XSL">
-            <fbs:DSInputLabel>XSL</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-09-17T02:47:56.422Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="tei2htmlSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="TEI">
+                        <fbs:DSInputLabel>TEI</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" pid="ilives:tei2htmlSdep-pageCModel" wsdlMsgPartName="XSL">
+                        <fbs:DSInputLabel>XSL</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-09-17T02:47:56.422Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.3" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="1938">
-      <foxml:xmlContent>
-        <wsdl:definitions name="tei2htmlSdep" targetNamespace="tei2htmlSdep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="tei2htmlSdep" targetNamespace="tei2htmlSdep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="tei2htmlSdep"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="tei2htmlRequestMsg">
-            <wsdl:part name="TEI" type="xsd:string"/>
-            <wsdl:part name="XSL" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="response">
-            <wsdl:part name="exhibit" type="xsd:base64Binary"/>
-          </wsdl:message>
-          <wsdl:portType name="tei2html_portType">
-            <wsdl:operation name="tei2html">
-              <wsdl:input message="this:tei2htmlRequestMsg"/>
-              <wsdl:output message="this:response"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="tei2html_service">
-            <wsdl:port binding="this:tei2html_binding" name="tei2html_port">
-              <http:address location="http://local.fedora.server/saxon/"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="tei2html_binding" type="this:tei2html_portType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="tei2html">
-              <http:operation location="SaxonServlet?source=(TEI)&amp;style=(XSL)&amp;clear-stylesheet-cache=yes"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/html"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-09-17T02:51:06.102Z"
+                    <wsdl:message name="tei2htmlRequestMsg">
+                        <wsdl:part name="TEI" type="xsd:string"/>
+                        <wsdl:part name="XSL" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="response">
+                        <wsdl:part name="exhibit" type="xsd:base64Binary"/>
+                    </wsdl:message>
+                    <wsdl:portType name="tei2html_portType">
+                        <wsdl:operation name="tei2html">
+                            <wsdl:input message="this:tei2htmlRequestMsg"/>
+                            <wsdl:output message="this:response"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="tei2html_service">
+                        <wsdl:port binding="this:tei2html_binding" name="tei2html_port">
+                            <http:address location="http://local.fedora.server/saxon/"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="tei2html_binding" type="this:tei2html_portType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="tei2html">
+                            <http:operation location="SaxonServlet?source=(TEI)&amp;style=(XSL)&amp;clear-stylesheet-cache=yes"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/html"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-09-17T02:51:06.102Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP.6" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="695">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="tei2html" wsdlMsgName="tei2htmlRequestMsg" wsdlMsgOutput="response">
-            <fmm:DatastreamInputParm parmName="TEI" passBy="URL_REF" required="true"/>
-            <fmm:DatastreamInputParm parmName="XSL" passBy="URL_REF" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="text/html"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="XSL" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-12-11T19:22:11.096Z" ID="XSL.2"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="tei2html" wsdlMsgName="tei2htmlRequestMsg" wsdlMsgOutput="response">
+                        <fmm:DatastreamInputParm parmName="TEI" passBy="URL_REF" required="true"/>
+                        <fmm:DatastreamInputParm parmName="XSL" passBy="URL_REF" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="text/html"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="XSL" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-12-11T19:22:11.096Z" ID="XSL.2"
       LABEL="XSL stylesheet for tei2html conversion" MIMETYPE="text/xml" SIZE="3406">
-      <foxml:xmlContent>
-        <xsl:stylesheet exclude-result-prefixes="tei" version="2.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-          <xsl:output doctype-public="-//W3C//DTD HTML 4.01 Strict//EN"
+            <foxml:xmlContent>
+                <xsl:stylesheet exclude-result-prefixes="tei" version="2.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+                    <xsl:output doctype-public="-//W3C//DTD HTML 4.01 Strict//EN"
             doctype-system="http://www.w3.org/TR/html4/strict.dtd" indent="yes" method="html" omit-xml-declaration="yes"/>
-          <xsl:template match="tei:TEI">
-            <html>
-              <head>
-                <title>
-                  <xsl:value-of select="normalize-space(tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title)"/>
-                </title>
-              </head>
-              <body>
-                <xsl:apply-templates/>
-              </body>
-            </html>
-          </xsl:template>
-          <xsl:template match="tei:body">
-            <div class="tei">
-              <xsl:apply-templates/>
-            </div>
-          </xsl:template>
-          <xsl:template match="tei:p">
-            <p>
-              <xsl:apply-templates/>
-            </p>
-          </xsl:template>
-          <xsl:template match="tei:date">
-            <span class="date">
-              <xsl:value-of select="normalize-space(.)"/>
-            </span>
-          </xsl:template>
-          <xsl:template match="tei:persName">
-            <xsl:choose>
-              <xsl:when test="(.//tei:surname) and (.//tei:forename)">
-                <span class="persName">
-                  <a>
-                    <xsl:attribute name="class">search persName</xsl:attribute>
-                    <xsl:attribute name="target">_blank</xsl:attribute>
-                    <xsl:attribute
-                        name="href">http://islandlives.net/fedora/ilives_book_search/tei.persNameTERM:%22<xsl:value-of
-                        select=".//tei:surname"/>+<xsl:value-of select=".//tei:forename"/>%22+AND+dc.type:collection</xsl:attribute>
-                    <xsl:apply-templates select="*|node()"/>
-                  </a>
-                </span>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="*|node()"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template match="tei:placeName">
-            <a>
-              <xsl:attribute name="class">search placeName</xsl:attribute>
-              <xsl:attribute name="target">_blank</xsl:attribute>
-              <xsl:attribute
-                  name="href">http://islandlives.net/fedora/ilives_book_search/tei.placeNameTERM:%22<xsl:value-of select="normalize-space(.)"/>%22+AND+dc.type:collection</xsl:attribute>
-              <xsl:value-of select="normalize-space(.)"/>
-            </a>
-          </xsl:template>
-          <xsl:template match="tei:orgName">
-            <a>
-              <xsl:attribute name="class">search orgName</xsl:attribute>
-              <xsl:attribute name="target">_blank</xsl:attribute>
-              <xsl:attribute
-                  name="href">http://islandlives.net/fedora/ilives_book_search/tei.orgNameTERM:%22<xsl:value-of select="normalize-space(.)"/>%22+AND+dc.type:collection</xsl:attribute>
-              <xsl:value-of select="normalize-space(.)"/>
-            </a>
-          </xsl:template>
-          <xsl:template match="tei:teiHeader"/>
-        </xsl:stylesheet>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <xsl:template match="tei:TEI">
+                        <html>
+                            <head>
+                                <title>
+                                    <xsl:value-of select="normalize-space(tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title)"/>
+                                </title>
+                            </head>
+                            <body>
+                                <xsl:apply-templates/>
+                            </body>
+                        </html>
+                    </xsl:template>
+                    <xsl:template match="tei:body">
+                        <div class="tei">
+                            <xsl:apply-templates/>
+                        </div>
+                    </xsl:template>
+                    <xsl:template match="tei:p">
+                        <p>
+                            <xsl:apply-templates/>
+                        </p>
+                    </xsl:template>
+                    <xsl:template match="tei:date">
+                        <span class="date">
+                            <xsl:value-of select="normalize-space(.)"/>
+                        </span>
+                    </xsl:template>
+                    <xsl:template match="tei:persName">
+                        <xsl:choose>
+                            <xsl:when test="(.//tei:surname) and (.//tei:forename)">
+                                <span class="persName">
+                                    <a>
+                                        <xsl:attribute name="class">search persName</xsl:attribute>
+                                        <xsl:attribute name="target">_blank</xsl:attribute>
+                                        <xsl:attribute
+                        name="href">http://islandlives.net/fedora/ilives_book_search/tei.persNameTERM:%22
+                                            <xsl:value-of
+                        select=".//tei:surname"/>+
+                                            <xsl:value-of select=".//tei:forename"/>%22+AND+dc.type:collection
+                                        </xsl:attribute>
+                                        <xsl:apply-templates select="*|node()"/>
+                                    </a>
+                                </span>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:apply-templates select="*|node()"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template match="tei:placeName">
+                        <a>
+                            <xsl:attribute name="class">search placeName</xsl:attribute>
+                            <xsl:attribute name="target">_blank</xsl:attribute>
+                            <xsl:attribute
+                  name="href">http://islandlives.net/fedora/ilives_book_search/tei.placeNameTERM:%22
+                                <xsl:value-of select="normalize-space(.)"/>%22+AND+dc.type:collection
+                            </xsl:attribute>
+                            <xsl:value-of select="normalize-space(.)"/>
+                        </a>
+                    </xsl:template>
+                    <xsl:template match="tei:orgName">
+                        <a>
+                            <xsl:attribute name="class">search orgName</xsl:attribute>
+                            <xsl:attribute name="target">_blank</xsl:attribute>
+                            <xsl:attribute
+                  name="href">http://islandlives.net/fedora/ilives_book_search/tei.orgNameTERM:%22
+                                <xsl:value-of select="normalize-space(.)"/>%22+AND+dc.type:collection
+                            </xsl:attribute>
+                            <xsl:value-of select="normalize-space(.)"/>
+                        </a>
+                    </xsl:template>
+                    <xsl:template match="tei:teiHeader"/>
+                </xsl:stylesheet>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_viewerSdef.xml

@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:viewerSdef" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:viewerSdef"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:14.247Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:viewerSdef"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T15:07:42.398Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:14.247Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T17:09:29.912Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_viewerSdef.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-05-25T13:17:14.247Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T17:09:29.912Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_viewerSdef.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-05-25T13:17:14.247Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.487Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="366">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:viewerSdef">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:viewerSdef">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T15:07:42.398Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="387">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:viewerSdef</dc:title>
-          <dc:identifier>ilives:viewerSdef</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
+                    <dc:title>ilives:viewerSdef</dc:title>
+                    <dc:identifier>ilives:viewerSdef</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T20:08:16.294Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP.3" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="181">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="getViewer"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="getViewer"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/ilives_viewerSdep-bookCModel.xml

@@ -1,157 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="ilives:viewerSdep-bookCModel" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:viewerSdep-bookCModel"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T19:50:00.488Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-31T20:57:49.117Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T19:50:00.488Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="ilives:viewerSdep-bookCModel"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-18T19:50:00.488Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-31T20:57:49.117Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T19:50:00.488Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-12T17:09:41.797Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_viewerSdep-bookCModel.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-31T20:03:42.709Z</audit:date>
-            <audit:justification>Ingested from source repository with pid ilives:viewerSdep-bookCModel</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-31T20:04:57.893Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-31T20:57:49.117Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-05-18T19:50:00.488Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-12T17:09:41.797Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/dev/iiv/iiv/etc/fedora-objects/ilives_viewerSdep-bookCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-31T20:03:42.709Z</audit:date>
+                        <audit:justification>Ingested from source repository with pid ilives:viewerSdep-bookCModel</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-31T20:04:57.893Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-31T20:57:49.117Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-05-18T19:50:00.488Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="409">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>ilives:viewerSdep-bookCModel</dc:title>
-          <dc:identifier>ilives:viewerSdep-bookCModel</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-18T19:52:55.042Z"
+                    <dc:title>ilives:viewerSdep-bookCModel</dc:title>
+                    <dc:identifier>ilives:viewerSdep-bookCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-18T19:52:55.042Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC.1"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="404">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="viewerSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
-            <fbs:DSInputLabel>DC</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-19T13:34:53.687Z"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="viewerSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
+                        <fbs:DSInputLabel>DC</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-19T13:34:53.687Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP.2" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="955">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="getViewer" wsdlMsgName="getViewerRequestMsg" wsdlMsgOutput="getViewerResponseMsg">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="ilives:bookCModel" label="content model" parmName="CMODEL"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="getViewer" wsdlMsgName="getViewerRequestMsg" wsdlMsgOutput="getViewerResponseMsg">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="ilives:bookCModel" label="content model" parmName="CMODEL"
               passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="getViewerResponseMsg" wsdlMsgTOMIME="text/html"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-05-19T13:34:20.768Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="getViewerResponseMsg" wsdlMsgTOMIME="text/html"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-05-19T13:34:20.768Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.4" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="2073">
-      <foxml:xmlContent>
-        <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="viewerSdep"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="getViewerRequestMsg">
-            <wsdl:part name="PID" type="xsd:string"/>
-            <wsdl:part name="CMODEL" type="xsd:string"/>
-            <wsdl:part name="DSID" type="xsd:string"/>
-            <wsdl:part name="uid" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="getViewerResponseMsg">
-            <wsdl:part name="RESPONSE" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:portType name="viewer_portType">
-            <wsdl:operation name="getViewer">
-              <wsdl:input message="this:getViewerRequestMsg"/>
-              <wsdl:output message="this:getViewerResponseMsg"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="viewer_service">
-            <wsdl:port binding="this:viewer_binding" name="viewer_port">
-              <http:address location="http://local.fedora.server/iiv/viewer.jsp"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="viewer_binding" type="this:viewer_portType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="getViewer">
-              <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/html"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-05-31T20:57:49.117Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+                    <wsdl:message name="getViewerRequestMsg">
+                        <wsdl:part name="PID" type="xsd:string"/>
+                        <wsdl:part name="CMODEL" type="xsd:string"/>
+                        <wsdl:part name="DSID" type="xsd:string"/>
+                        <wsdl:part name="uid" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="getViewerResponseMsg">
+                        <wsdl:part name="RESPONSE" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:portType name="viewer_portType">
+                        <wsdl:operation name="getViewer">
+                            <wsdl:input message="this:getViewerRequestMsg"/>
+                            <wsdl:output message="this:getViewerResponseMsg"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="viewer_service">
+                        <wsdl:port binding="this:viewer_binding" name="viewer_port">
+                            <http:address location="http://local.fedora.server/iiv/viewer.jsp"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="viewer_binding" type="this:viewer_portType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="getViewer">
+                            <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/html"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-05-31T20:57:49.117Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.3" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="562">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:viewerSdep-bookCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/ilives:bookCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:viewerSdep-bookCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/ilives:bookCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_jp2Sdep-slideCModel.xml

@@ -3,197 +3,197 @@
 xmlns:foxml="info:fedora/fedora-system:def/foxml#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="islandora:jp2Sdep-slideCModel"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-11-27T18:25:48.654Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-03-11T20:58:05.234Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
-<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-11-27T18:25:48.654Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
-<foxml:xmlContent>
-<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-<audit:record ID="AUDREC1">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-11-27T18:25:48.654Z</audit:date>
-<audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC2">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>METHODMAP</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-11-27T18:30:03.064Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC3">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>DSINPUTSPEC</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-11-27T18:30:34.272Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC4">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>WSDL</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-11-27T18:31:33.967Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC5">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>RELS-EXT</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-11-27T18:36:14.648Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC6">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2010-01-26T20:06:07.452Z</audit:date>
-<audit:justification>Ingested from local file /Users/aoneill/Desktop/tmp/islandora_jp2Sdep-slideCModel.xml</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC7">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>RELS-EXT</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2010-03-05T16:47:23.192Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC8">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>RELS-EXT</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2010-03-11T20:58:05.234Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-</audit:auditTrail>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="618">
-<foxml:xmlContent>
-<rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></fedora-model:hasModel>
-            <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"></fedora-model:isDeploymentOf>
-            <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"></fedora-model:isContractorOf>
-          </rdf:Description>
-        </rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="RELS-EXT.1" LABEL="RDF Statements about this object" CREATED="2009-11-27T18:36:14.648Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="612">
-<foxml:xmlContent>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
-            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
-            <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
-            <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
-          </rdf:Description>
-        </rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="RELS-EXT.2" LABEL="RDF Statements about this object" CREATED="2010-03-05T16:47:23.192Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="695">
-<foxml:xmlContent>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
-    <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
-    <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
-    <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
-    <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:herbCModel"></isContractorOf>
-  </rdf:Description>
-</rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="RELS-EXT.3" LABEL="RDF Statements about this object" CREATED="2010-03-11T20:58:05.234Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="825">
-<foxml:xmlContent>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
-    <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
-    <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
-    <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
-    <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:herbCModel"></isContractorOf>
-    <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:mapCModel"></isContractorOf>
-  </rdf:Description>
-</rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="METHODMAP" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="METHODMAP1.0" LABEL="Deployment Method Map" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" SIZE="298">
-<foxml:xmlContent>
-<comment xmlns="info:fedora/fedora-system:def/comment#">
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="islandora:jp2Sdep-slideCModel"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-11-27T18:25:48.654Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-03-11T20:58:05.234Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
+        <foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-11-27T18:25:48.654Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:25:48.654Z</audit:date>
+                        <audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>METHODMAP</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:30:03.064Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>DSINPUTSPEC</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:30:34.272Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>WSDL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:31:33.967Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC5">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:36:14.648Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC6">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-01-26T20:06:07.452Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/Desktop/tmp/islandora_jp2Sdep-slideCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC7">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-05T16:47:23.192Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC8">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-11T20:58:05.234Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="618">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></fedora-model:hasModel>
+                        <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"></fedora-model:isDeploymentOf>
+                        <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"></fedora-model:isContractorOf>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="RELS-EXT.1" LABEL="RDF Statements about this object" CREATED="2009-11-27T18:36:14.648Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="612">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
+                        <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
+                        <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="RELS-EXT.2" LABEL="RDF Statements about this object" CREATED="2010-03-05T16:47:23.192Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="695">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
+                        <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
+                        <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:herbCModel"></isContractorOf>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="RELS-EXT.3" LABEL="RDF Statements about this object" CREATED="2010-03-11T20:58:05.234Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="825">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:jp2Sdep-slideCModel">
+                        <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"></hasModel>
+                        <isDeploymentOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ilives:jp2Sdef"></isDeploymentOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:slideCModel"></isContractorOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:herbCModel"></isContractorOf>
+                        <isContractorOf xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/islandora:mapCModel"></isContractorOf>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="METHODMAP" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="METHODMAP1.0" LABEL="Deployment Method Map" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" SIZE="298">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This METHODMAP datastream is included as a starting point to
           assist in the creation of a service deployment. The METHODMAP
           should define the the mapping of the WSDL to Fedora object methods.
-        </comment>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="METHODMAP.1" LABEL="Deployment Method Map" CREATED="2009-11-27T18:30:03.064Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" SIZE="2498">
-<foxml:xmlContent>
-<fmm:MethodMap xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap" bDefPID="djatoka:bDef" name="MethodMap - djatoka Service Methods">
-          <fmm:Method operationName="getMetadata" wsdlMsgName="getMetadataRequest" wsdlMsgOutput="response">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getMetadata" parmName="svc_id" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="application/json"></fmm:MethodReturnType>
-          </fmm:Method>
-          <fmm:Method operationName="getRegion" wsdlMsgName="getRegionRequest" wsdlMsgOutput="response">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getRegion" parmName="svc_id" passBy="VALUE" required="true"></fmm:DefaultInputParm>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="" parmName="region" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="0" parmName="rotate" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="-1" parmName="level" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="" parmName="scale" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="" parmName="clayers" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:UserInputParm defaultValue="image/jpeg" parmName="format" passBy="VALUE" required="false"></fmm:UserInputParm>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="image/jpeg"></fmm:MethodReturnType>
-          </fmm:Method>
-        </fmm:MethodMap>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DSINPUTSPEC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DSINPUTSPEC1.0" LABEL="Datastream Input Specification" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" SIZE="300">
-<foxml:xmlContent>
-<comment xmlns="info:fedora/fedora-system:def/comment#">
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="METHODMAP.1" LABEL="Deployment Method Map" CREATED="2009-11-27T18:30:03.064Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" SIZE="2498">
+            <foxml:xmlContent>
+                <fmm:MethodMap xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap" bDefPID="djatoka:bDef" name="MethodMap - djatoka Service Methods">
+                    <fmm:Method operationName="getMetadata" wsdlMsgName="getMetadataRequest" wsdlMsgOutput="response">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getMetadata" parmName="svc_id" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="application/json"></fmm:MethodReturnType>
+                    </fmm:Method>
+                    <fmm:Method operationName="getRegion" wsdlMsgName="getRegionRequest" wsdlMsgOutput="response">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:DefaultInputParm defaultValue="info:lanl-repo/svc/getRegion" parmName="svc_id" passBy="VALUE" required="true"></fmm:DefaultInputParm>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="" parmName="region" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="0" parmName="rotate" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="-1" parmName="level" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="" parmName="scale" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="" parmName="clayers" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:UserInputParm defaultValue="image/jpeg" parmName="format" passBy="VALUE" required="false"></fmm:UserInputParm>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="image/jpeg"></fmm:MethodReturnType>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="DSINPUTSPEC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DSINPUTSPEC1.0" LABEL="Datastream Input Specification" CREATED="2009-11-27T18:25:48.726Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" SIZE="300">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This DSINPUTSPEC datastream is included as a starting point to
           assist in the creation of a service deployment. The DSINPUTSPEC
           should define the datastreams to be used by WSDL-defined methods.
-        </comment>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="DSINPUTSPEC.1" LABEL="Datastream Input Specification" CREATED="2009-11-27T18:30:34.272Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" SIZE="401">
-<foxml:xmlContent>
-<fbs:DSInputSpec xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec" label="jp2SdepInputSpec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
-            <fbs:DSInputLabel>DC</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction></fbs:DSInputInstruction>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="WSDL" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="WSDL1.0" LABEL="WSDL Bindings" CREATED="2009-11-27T18:25:48.732Z" MIMETYPE="text/xml" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/" SIZE="752">
-<foxml:xmlContent>
-<comment xmlns="info:fedora/fedora-system:def/comment#">
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="DSINPUTSPEC.1" LABEL="Datastream Input Specification" CREATED="2009-11-27T18:30:34.272Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" SIZE="401">
+            <foxml:xmlContent>
+                <fbs:DSInputSpec xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec" label="jp2SdepInputSpec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
+                        <fbs:DSInputLabel>DC</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction></fbs:DSInputInstruction>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="WSDL" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="WSDL1.0" LABEL="WSDL Bindings" CREATED="2009-11-27T18:25:48.732Z" MIMETYPE="text/xml" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/" SIZE="752">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This WSDL datastream is included as a starting point to
             assist in the creation of a service deployment. The WSDL
             should define the services provided by this
@@ -205,73 +205,73 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
             demo:2, demo:13, demo:20, and demo:28.
           For more information about the demonstration objects, see:
             http://fedora-commons.org/confluence/x/AwFI.
-        </comment>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="WSDL.1" LABEL="WSDL Bindings" CREATED="2009-11-27T18:31:33.967Z" MIMETYPE="text/xml" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/" SIZE="3258">
-<foxml:xmlContent>
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap" xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="djatoka" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Fedora Local Djatoka Service" targetNamespace="jp2SDep">
-          <wsdl:message name="getMetadataRequest">
-            <wsdl:part name="PID" type="xsd:string"></wsdl:part>
-            <wsdl:part name="DSID" type="xsd:string"></wsdl:part>
-            <wsdl:part name="svc_id" type="xsd:string"></wsdl:part>
-          </wsdl:message>
-          <wsdl:message name="getRegionRequest">
-            <wsdl:part name="PID" type="xsd:string"></wsdl:part>
-            <wsdl:part name="DSID" type="xsd:string"></wsdl:part>
-            <wsdl:part name="svc_id" type="xsd:string"></wsdl:part>
-          </wsdl:message>
-          <wsdl:message name="response">
-            <wsdl:part name="exhibit" type="xsd:base64Binary"></wsdl:part>
-          </wsdl:message>
-          <wsdl:portType name="FedoraDjatokaPortType">
-            <wsdl:operation name="getMetadata">
-              <wsdl:input message="this:getMetadataRequest"></wsdl:input>
-              <wsdl:output message="this:response"></wsdl:output>
-            </wsdl:operation>
-            <wsdl:operation name="getRegion">
-              <wsdl:input message="this:getRegionRequest"></wsdl:input>
-              <wsdl:output message="this:response"></wsdl:output>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="FedoraDjatoka">
-            <wsdl:port binding="this:FedoraDjatoka_http" name="FedoraDjatoka_port">
-              <http:address location="http://local.fedora.server/"></http:address>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="FedoraDjatoka_http" type="this:FedoraDjatokaPortType">
-            <http:binding verb="GET"></http:binding>
-            <wsdl:operation name="getMetadata">
-              <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)"></http:operation>
-              <wsdl:input>
-                <http:urlReplacement></http:urlReplacement>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="application/json"></mime:content>
-              </wsdl:output>
-            </wsdl:operation>
-            <wsdl:operation name="getRegion">
-              <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)&amp;svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg2000&amp;svc.format=(format)&amp;svc.level=(level)&amp;svc.rotate=(rotate)&amp;svc.region=(region)&amp;svc.scale=(scale)&amp;svc.clayers=(clayers)"></http:operation>
-              <wsdl:input>
-                <http:urlReplacement></http:urlReplacement>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="image/jpeg"></mime:content>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-11-27T18:25:48.654Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="411">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>islandora:jp2Sdep-slideCModel</dc:title>
-  <dc:identifier>islandora:jp2Sdep-slideCModel</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="WSDL.1" LABEL="WSDL Bindings" CREATED="2009-11-27T18:31:33.967Z" MIMETYPE="text/xml" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/" SIZE="3258">
+            <foxml:xmlContent>
+                <wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap" xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="djatoka" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Fedora Local Djatoka Service" targetNamespace="jp2SDep">
+                    <wsdl:message name="getMetadataRequest">
+                        <wsdl:part name="PID" type="xsd:string"></wsdl:part>
+                        <wsdl:part name="DSID" type="xsd:string"></wsdl:part>
+                        <wsdl:part name="svc_id" type="xsd:string"></wsdl:part>
+                    </wsdl:message>
+                    <wsdl:message name="getRegionRequest">
+                        <wsdl:part name="PID" type="xsd:string"></wsdl:part>
+                        <wsdl:part name="DSID" type="xsd:string"></wsdl:part>
+                        <wsdl:part name="svc_id" type="xsd:string"></wsdl:part>
+                    </wsdl:message>
+                    <wsdl:message name="response">
+                        <wsdl:part name="exhibit" type="xsd:base64Binary"></wsdl:part>
+                    </wsdl:message>
+                    <wsdl:portType name="FedoraDjatokaPortType">
+                        <wsdl:operation name="getMetadata">
+                            <wsdl:input message="this:getMetadataRequest"></wsdl:input>
+                            <wsdl:output message="this:response"></wsdl:output>
+                        </wsdl:operation>
+                        <wsdl:operation name="getRegion">
+                            <wsdl:input message="this:getRegionRequest"></wsdl:input>
+                            <wsdl:output message="this:response"></wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="FedoraDjatoka">
+                        <wsdl:port binding="this:FedoraDjatoka_http" name="FedoraDjatoka_port">
+                            <http:address location="http://local.fedora.server/"></http:address>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="FedoraDjatoka_http" type="this:FedoraDjatokaPortType">
+                        <http:binding verb="GET"></http:binding>
+                        <wsdl:operation name="getMetadata">
+                            <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)"></http:operation>
+                            <wsdl:input>
+                                <http:urlReplacement></http:urlReplacement>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="application/json"></mime:content>
+                            </wsdl:output>
+                        </wsdl:operation>
+                        <wsdl:operation name="getRegion">
+                            <http:operation location="adore-djatoka/resolver?url_ver=Z39.88-2004&amp;rft_id=http://local.fedora.server/fedora/get/(PID)/(DSID)&amp;svc_id=(svc_id)&amp;svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg2000&amp;svc.format=(format)&amp;svc.level=(level)&amp;svc.rotate=(rotate)&amp;svc.region=(region)&amp;svc.scale=(scale)&amp;svc.clayers=(clayers)"></http:operation>
+                            <wsdl:input>
+                                <http:urlReplacement></http:urlReplacement>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="image/jpeg"></mime:content>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-11-27T18:25:48.654Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="411">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>islandora:jp2Sdep-slideCModel</dc:title>
+                    <dc:identifier>islandora:jp2Sdep-slideCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_largeimages.xml

@@ -1,247 +1,247 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="islandora:largeimages" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Large Images Collection"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-12-20T16:02:16.800Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-12-20T16:09:32.544Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:16.800Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Large Images Collection"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-12-20T16:02:16.800Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-12-20T16:09:32.544Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:16.800Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:02:16.800Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>addDatastream</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:02:17.020Z</audit:date>
-            <audit:justification>Ingested object RELS-EXT</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:02:17.091Z</audit:date>
-            <audit:justification>Modified by Islandora API</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:02:17.142Z</audit:date>
-            <audit:justification>Modified by Islandora API</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC5">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>addDatastream</audit:action>
-            <audit:componentID>COLLECTION_POLICY</audit:componentID>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:02:17.213Z</audit:date>
-            <audit:justification>Ingested object COLLECTION_POLICY</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC6">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:08:27.075Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC7">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>addDatastream</audit:action>
-            <audit:componentID>TN</audit:componentID>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-12-20T16:08:27.131Z</audit:date>
-            <audit:justification>Ingested object TN</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC8">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>purgeDatastream</audit:action>
-            <audit:componentID>TN</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-12-20T16:09:24.726Z</audit:date>
-            <audit:justification>DatastreamPane generated this logMessage. . . . Purged datastream (ID=TN), versions ranging from 2010-12-20T12:08:27.131Z to 2010-12-20T12:08:27.131Z.  This resulted in the permanent removal of 1 datastream version(s) (2010-12-20T12:08:27.131Z) and all associated audit records.</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC9">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>COLLECTION_POLICY</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-12-20T16:09:32.544Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:16.800Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:02:16.800Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>addDatastream</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:02:17.020Z</audit:date>
+                        <audit:justification>Ingested object RELS-EXT</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:02:17.091Z</audit:date>
+                        <audit:justification>Modified by Islandora API</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:02:17.142Z</audit:date>
+                        <audit:justification>Modified by Islandora API</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC5">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>addDatastream</audit:action>
+                        <audit:componentID>COLLECTION_POLICY</audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:02:17.213Z</audit:date>
+                        <audit:justification>Ingested object COLLECTION_POLICY</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC6">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:08:27.075Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC7">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>addDatastream</audit:action>
+                        <audit:componentID>TN</audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-12-20T16:08:27.131Z</audit:date>
+                        <audit:justification>Ingested object TN</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC8">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>purgeDatastream</audit:action>
+                        <audit:componentID>TN</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-12-20T16:09:24.726Z</audit:date>
+                        <audit:justification>DatastreamPane generated this logMessage. . . . Purged datastream (ID=TN), versions ranging from 2010-12-20T12:08:27.131Z to 2010-12-20T12:08:27.131Z.  This resulted in the permanent removal of 1 datastream version(s) (2010-12-20T12:08:27.131Z) and all associated audit records.</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC9">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>COLLECTION_POLICY</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-12-20T16:09:32.544Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:16.800Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="397">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Large Images Collection</dc:title>
-          <dc:identifier>islandora:largeimages</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.020Z" ID="RELS-EXT.0"
+                    <dc:title>Large Images Collection</dc:title>
+                    <dc:identifier>islandora:largeimages</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.020Z" ID="RELS-EXT.0"
       LABEL="Fedora object-to-object relationship metadata" MIMETYPE="text/xml" SIZE="178">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:largeimages"/>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.091Z" ID="RELS-EXT.1"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:largeimages"/>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.091Z" ID="RELS-EXT.1"
       LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="text/xml" SIZE="361">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:largeimages">
-            <fedora-model:hasModel rdf:resource="info:fedora/islandora:collectionCModel" xmlns:fedora-model="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.142Z" ID="RELS-EXT.2"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:largeimages">
+                        <fedora-model:hasModel rdf:resource="info:fedora/islandora:collectionCModel" xmlns:fedora-model="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.142Z" ID="RELS-EXT.2"
       LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="text/xml" SIZE="520">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:largeimages">
-            <fedora-model:hasModel rdf:resource="info:fedora/islandora:collectionCModel" xmlns:fedora-model="info:fedora/fedora-system:def/model#"/>
-            <isMemberOfCollection rdf:resource="info:fedora/islandora:demos" xmlns="info:fedora/fedora-system:def/relations-external#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="COLLECTION_POLICY" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.213Z" ID="COLLECTION_POLICY.0" LABEL="Large Images Collection"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:largeimages">
+                        <fedora-model:hasModel rdf:resource="info:fedora/islandora:collectionCModel" xmlns:fedora-model="info:fedora/fedora-system:def/model#"/>
+                        <isMemberOfCollection rdf:resource="info:fedora/islandora:demos" xmlns="info:fedora/fedora-system:def/relations-external#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="COLLECTION_POLICY" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-12-20T16:02:17.213Z" ID="COLLECTION_POLICY.0" LABEL="Large Images Collection"
       MIMETYPE="text/xml" SIZE="2533">
-      <foxml:xmlContent>
-        <collection_policy name="Large Images Collection">
-          <contentmodels>
-            <contentmodel name="SLIDE_CMODEL">
-              <pid_namespace>islandora:slide</pid_namespace>
-              <pid>islandora:slideCModel</pid>
-              <dsid>ISLANDORACM</dsid>
-            </contentmodel>
-            <contentmodel name="MAP_CMODEL">
-              <pid_namespace>islandora:map</pid_namespace>
-              <pid>islandora:mapCModel</pid>
-              <dsid>ISLANDORACM</dsid>
-            </contentmodel>
-            <contentmodel name="HERB_CMODEL">
-              <pid_namespace>islandora:herb</pid_namespace>
-              <pid>islandora:herbCModel</pid>
-              <dsid>ISLANDORACM</dsid>
-            </contentmodel>
-          </contentmodels>
-          <relationship>isMemberOfCollection</relationship>
-          <search_terms>
-            <default>dc.description</default>
-            <term>
-              <field>dc.title</field>
-              <value>dc.title</value>
-            </term>
-            <term>
-              <field>dc.creator</field>
-              <value>dc.creator</value>
-            </term>
-            <term>
-              <field>dc.description</field>
-              <value>dc.description</value>
-            </term>
-            <term>
-              <field>dc.date</field>
-              <value>dc.date</value>
-            </term>
-            <term>
-              <field>dc.identifier</field>
-              <value>dc.identifier</value>
-            </term>
-            <term>
-              <field>dc.language</field>
-              <value>dc.language</value>
-            </term>
-            <term>
-              <field>dc.publisher</field>
-              <value>dc.publisher</value>
-            </term>
-            <term>
-              <field>dc.rights</field>
-              <value>dc.rights</value>
-            </term>
-            <term>
-              <field>dc.subject</field>
-              <value>dc.subject</value>
-            </term>
-            <term>
-              <field>dc.relation</field>
-              <value>dc.relation</value>
-            </term>
-            <term>
-              <field>dcterms.temporal</field>
-              <value>dcterms.temporal</value>
-            </term>
-            <term>
-              <field>dcterms.spatial</field>
-              <value>dcterms.spatial</value>
-            </term>
-            <term>
-              <field>fgs.DS.first.text</field>
-              <value>Full Text</value>
-            </term>
-          </search_terms>
-        </collection_policy>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-12-20T16:09:32.544Z" ID="COLLECTION_POLICY.1" LABEL="Large Images Collection"
+            <foxml:xmlContent>
+                <collection_policy name="Large Images Collection">
+                    <contentmodels>
+                        <contentmodel name="SLIDE_CMODEL">
+                            <pid_namespace>islandora:slide</pid_namespace>
+                            <pid>islandora:slideCModel</pid>
+                            <dsid>ISLANDORACM</dsid>
+                        </contentmodel>
+                        <contentmodel name="MAP_CMODEL">
+                            <pid_namespace>islandora:map</pid_namespace>
+                            <pid>islandora:mapCModel</pid>
+                            <dsid>ISLANDORACM</dsid>
+                        </contentmodel>
+                        <contentmodel name="HERB_CMODEL">
+                            <pid_namespace>islandora:herb</pid_namespace>
+                            <pid>islandora:herbCModel</pid>
+                            <dsid>ISLANDORACM</dsid>
+                        </contentmodel>
+                    </contentmodels>
+                    <relationship>isMemberOfCollection</relationship>
+                    <search_terms>
+                        <default>dc.description</default>
+                        <term>
+                            <field>dc.title</field>
+                            <value>dc.title</value>
+                        </term>
+                        <term>
+                            <field>dc.creator</field>
+                            <value>dc.creator</value>
+                        </term>
+                        <term>
+                            <field>dc.description</field>
+                            <value>dc.description</value>
+                        </term>
+                        <term>
+                            <field>dc.date</field>
+                            <value>dc.date</value>
+                        </term>
+                        <term>
+                            <field>dc.identifier</field>
+                            <value>dc.identifier</value>
+                        </term>
+                        <term>
+                            <field>dc.language</field>
+                            <value>dc.language</value>
+                        </term>
+                        <term>
+                            <field>dc.publisher</field>
+                            <value>dc.publisher</value>
+                        </term>
+                        <term>
+                            <field>dc.rights</field>
+                            <value>dc.rights</value>
+                        </term>
+                        <term>
+                            <field>dc.subject</field>
+                            <value>dc.subject</value>
+                        </term>
+                        <term>
+                            <field>dc.relation</field>
+                            <value>dc.relation</value>
+                        </term>
+                        <term>
+                            <field>dcterms.temporal</field>
+                            <value>dcterms.temporal</value>
+                        </term>
+                        <term>
+                            <field>dcterms.spatial</field>
+                            <value>dcterms.spatial</value>
+                        </term>
+                        <term>
+                            <field>fgs.DS.first.text</field>
+                            <value>Full Text</value>
+                        </term>
+                    </search_terms>
+                </collection_policy>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-12-20T16:09:32.544Z" ID="COLLECTION_POLICY.1" LABEL="Large Images Collection"
       MIMETYPE="text/xml" SIZE="1428">
-      <foxml:xmlContent>
-        <collection_policy name="Large Images Collection" xmlns="http://www.islandora.ca"
+            <foxml:xmlContent>
+                <collection_policy name="Large Images Collection" xmlns="http://www.islandora.ca"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
-          <content_models>
-            <content_model dsid="ISLANDORACM" name="SLIDE_CMODEL" namespace="islandora:slide" pid="islandora:slideCModel"/>
-            <content_model dsid="ISLANDORACM" name="MAP_CMODEL" namespace="islandora:map" pid="islandora:mapCModel"/>
-            <content_model dsid="ISLANDORACM" name="HERB_CMODEL" namespace="islandora:herb" pid="islandora:herbCModel"/>
-          </content_models>
-          <search_terms>
-            <term field="dc.title">dc.title</term>
-            <term field="dc.creator">dc.creator</term>
-            <term default="true" field="dc.description">dc.description</term>
-            <term field="dc.date">dc.date</term>
-            <term field="dc.identifier">dc.identifier</term>
-            <term field="dc.language">dc.language</term>
-            <term field="dc.publisher">dc.publisher</term>
-            <term field="dc.rights">dc.rights</term>
-            <term field="dc.subject">dc.subject</term>
-            <term field="dc.relation">dc.relation</term>
-            <term field="dcterms.temporal">dcterms.temporal</term>
-            <term field="dcterms.spatial">dcterms.spatial</term>
-            <term field="fgs.DS.first.text">Full Text</term>
-          </search_terms>
-          <relationship>isMemberOfCollection</relationship>
-        </collection_policy>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <content_models>
+                        <content_model dsid="ISLANDORACM" name="SLIDE_CMODEL" namespace="islandora:slide" pid="islandora:slideCModel"/>
+                        <content_model dsid="ISLANDORACM" name="MAP_CMODEL" namespace="islandora:map" pid="islandora:mapCModel"/>
+                        <content_model dsid="ISLANDORACM" name="HERB_CMODEL" namespace="islandora:herb" pid="islandora:herbCModel"/>
+                    </content_models>
+                    <search_terms>
+                        <term field="dc.title">dc.title</term>
+                        <term field="dc.creator">dc.creator</term>
+                        <term default="true" field="dc.description">dc.description</term>
+                        <term field="dc.date">dc.date</term>
+                        <term field="dc.identifier">dc.identifier</term>
+                        <term field="dc.language">dc.language</term>
+                        <term field="dc.publisher">dc.publisher</term>
+                        <term field="dc.rights">dc.rights</term>
+                        <term field="dc.subject">dc.subject</term>
+                        <term field="dc.relation">dc.relation</term>
+                        <term field="dcterms.temporal">dcterms.temporal</term>
+                        <term field="dcterms.spatial">dcterms.spatial</term>
+                        <term field="fgs.DS.first.text">Full Text</term>
+                    </search_terms>
+                    <relationship>isMemberOfCollection</relationship>
+                </collection_policy>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_mapCModel.xml

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="islandora:mapCModel" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Islandora Map Content Model"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-05-25T12:52:58.656Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-09-16T16:13:49.927Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.656Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Islandora Map Content Model"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-05-25T12:52:58.656Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-09-16T16:13:49.927Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.656Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-25T12:52:58.656Z</audit:date>
-            <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>addDatastream</audit:action>
-            <audit:componentID>ISLANDORACM</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-25T12:53:38.788Z</audit:date>
-            <audit:justification>DatastreamsPane generated this logMessage.</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-09-16T16:13:13.388Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/fedora_repository/content_models/islandora_mapCModel.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>ISLANDORACM</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-09-16T16:13:49.927Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.744Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-25T12:52:58.656Z</audit:date>
+                        <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>addDatastream</audit:action>
+                        <audit:componentID>ISLANDORACM</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-25T12:53:38.788Z</audit:date>
+                        <audit:justification>DatastreamsPane generated this logMessage.</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-09-16T16:13:13.388Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/fedora_repository/content_models/islandora_mapCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>ISLANDORACM</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-09-16T16:13:49.927Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.744Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="363">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:mapCModel">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.745Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:mapCModel">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DS-COMPOSITE-MODEL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.745Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSCompositeModel-1.0" ID="DS-COMPOSITE-MODEL1.0"
       LABEL="Datastream Composite Model" MIMETYPE="text/xml" SIZE="1120">
-      <foxml:xmlContent>
-        <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
-          <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
+                    <comment xmlns="info:fedora/fedora-system:def/comment#">
             This DS-COMPOSITE-MODEL datastream is included as a starting point to
               assist in the creation of a content model. The DS-COMPOSITE-MODEL
               should define the datastreams that are required for any objects
@@ -80,287 +80,287 @@
               demo:TEI_TO_PDFDOC, and demo:XML_TO_HTMLDOC.
             For more information about the demonstration objects, see:
               http://fedora-commons.org/confluence/x/AwFI.
-          </comment>
-          <dsTypeModel ID="DSID">
-            <form MIME="text/xml"/>
-          </dsTypeModel>
-        </dsCompositeModel>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.656Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+                    </comment>
+                    <dsTypeModel ID="DSID">
+                        <form MIME="text/xml"/>
+                    </dsTypeModel>
+                </dsCompositeModel>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-05-25T12:52:58.656Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="399">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>Islandora Map Content Model</dc:title>
-          <dc:identifier>islandora:mapCModel</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="ISLANDORACM" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-05-25T12:53:38.788Z" ID="ISLANDORACM.0"
+                    <dc:title>Islandora Map Content Model</dc:title>
+                    <dc:identifier>islandora:mapCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="ISLANDORACM" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-05-25T12:53:38.788Z" ID="ISLANDORACM.0"
       LABEL="Islandora Content Model Object" MIMETYPE="text/xml" SIZE="7098">
-      <foxml:xmlContent>
-        <content_model name="Standard_Map">
-          <mimetypes>
-            <type>image/tiff</type>
-            <type>image/tif</type>
-          </mimetypes>
-          <display_in_fieldset>
-            <datastream id="JPG">
-              <method>
-                <file>plugins/map_viewer.inc</file>
-                <class_name>ShowMapStreamsInFieldSets</class_name>
-                <method_name>showJPG</method_name>
-              </method>
-            </datastream>
-            <datastream id="JP2"/>
-            <datastream id="FULL_SIZE"/>
-            <datastream id="FULL_JPG"/>
-            <datastream id="DC"/>
-            <datastream id="MODS"/>
-          </display_in_fieldset>
-          <ingest_rules>
-            <rule>
-              <applies_to>
+            <foxml:xmlContent>
+                <content_model name="Standard_Map">
+                    <mimetypes>
+                        <type>image/tiff</type>
+                        <type>image/tif</type>
+                    </mimetypes>
+                    <display_in_fieldset>
+                        <datastream id="JPG">
+                            <method>
+                                <file>plugins/map_viewer.inc</file>
+                                <class_name>ShowMapStreamsInFieldSets</class_name>
+                                <method_name>showJPG</method_name>
+                            </method>
+                        </datastream>
+                        <datastream id="JP2"/>
+                        <datastream id="FULL_SIZE"/>
+                        <datastream id="FULL_JPG"/>
+                        <datastream id="DC"/>
+                        <datastream id="MODS"/>
+                    </display_in_fieldset>
+                    <ingest_rules>
+                        <rule>
+                            <applies_to>
               image/tiff
-            </applies_to>
-              <applies_to>
+                            </applies_to>
+                            <applies_to>
               image/tif
-      </applies_to>
-              <methods>
-                <method>
-                  <file>plugins/ImageManipulation.inc</file>
-                  <class_name>ImageManipulation</class_name>
-                  <method_name>createJP2</method_name>
-                  <modified_files_ext>jp2</modified_files_ext>
-                  <datastream_id>JP2</datastream_id>
-                </method>
-              </methods>
-            </rule>
-          </ingest_rules>
-          <ingest_form dsid="QDC" page="2">
-            <form_builder_method>
-              <file>plugins/DemoFormBuilder.inc</file>
-              <class_name>DemoFormBuilder</class_name>
-              <method_name>buildQDCForm</method_name>
-              <form_handler>handleQDCForm</form_handler>
-            </form_builder_method>
-            <form_elements>
-              <element>
-                <label>Title/Caption/Image Name</label>
-                <name>dc:title</name>
-                <type>textfield</type>
-                <description>The name given to the resource</description>
-                <required>true</required>
-              </element>
-              <element>
-                <label>Creator/Photographer</label>
-                <name>dc:creator</name>
-                <type>textfield</type>
-                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Subject</label>
-                <name>dc:subject</name>
-                <type>select</type>
-                <description>Subject</description>
-                <required>false</required>
-                <authoritative_list>
-                  <item>
-                    <field>image</field>
-                    <value>image</value>
-                  </item>
-                  <item>
-                    <field>photograph</field>
-                    <value>photograph</value>
-                  </item>
-                  <item>
-                    <field>presentation</field>
-                    <value>presentation</value>
-                  </item>
-                  <item>
-                    <field>art</field>
-                    <value>art</value>
-                  </item>
-                </authoritative_list>
-              </element>
-              <element>
-                <label>Description</label>
-                <name>dc:description</name>
-                <type>textarea</type>
-                <description>Description of the Image</description>
-                <required>true</required>
-              </element>
-              <element>
-                <label>Publisher</label>
-                <name>dc:publisher</name>
-                <type>textfield</type>
-                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Contributor</label>
-                <name>dc:contributor</name>
-                <type>textfield</type>
-                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Date</label>
-                <name>dc:date</name>
-                <type>textfield</type>
-                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Resource Type</label>
-                <name>dc:type</name>
-                <type>textfield</type>
-                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Source</label>
-                <name>dc:source</name>
-                <type>textfield</type>
-                <description>A reference to a resource from which the present resource is derived.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Identifier</label>
-                <name>dc:identifier</name>
-                <type>textfield</type>
-                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Language</label>
-                <name>dc:language</name>
-                <type>select</type>
-                <description>The language of the intellectual content of the resource.</description>
-                <required>false</required>
-                <authoritative_list>
-                  <item>
-                    <field>eng</field>
-                    <value>English</value>
-                  </item>
-                  <item>
-                    <field>fre</field>
-                    <value>French</value>
-                  </item>
-                </authoritative_list>
-              </element>
-              <element>
-                <label>Relation</label>
-                <name>dc:relation</name>
-                <type>textfield</type>
-                <description>Reference to a related resource.</description>
-                <required>false</required>
-              </element>
-              <element>
-                <label>Rights Management</label>
-                <name>dc:rights</name>
-                <type>textarea</type>
-                <description>Information about intellectual property rights, copyright, and various property rights.</description>
-                <required>false</required>
-              </element>
-            </form_elements>
-          </ingest_form>
-        </content_model>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-09-16T16:13:49.927Z" ID="ISLANDORACM.1"
+                            </applies_to>
+                            <methods>
+                                <method>
+                                    <file>plugins/ImageManipulation.inc</file>
+                                    <class_name>ImageManipulation</class_name>
+                                    <method_name>createJP2</method_name>
+                                    <modified_files_ext>jp2</modified_files_ext>
+                                    <datastream_id>JP2</datastream_id>
+                                </method>
+                            </methods>
+                        </rule>
+                    </ingest_rules>
+                    <ingest_form dsid="QDC" page="2">
+                        <form_builder_method>
+                            <file>plugins/DemoFormBuilder.inc</file>
+                            <class_name>DemoFormBuilder</class_name>
+                            <method_name>buildQDCForm</method_name>
+                            <form_handler>handleQDCForm</form_handler>
+                        </form_builder_method>
+                        <form_elements>
+                            <element>
+                                <label>Title/Caption/Image Name</label>
+                                <name>dc:title</name>
+                                <type>textfield</type>
+                                <description>The name given to the resource</description>
+                                <required>true</required>
+                            </element>
+                            <element>
+                                <label>Creator/Photographer</label>
+                                <name>dc:creator</name>
+                                <type>textfield</type>
+                                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Subject</label>
+                                <name>dc:subject</name>
+                                <type>select</type>
+                                <description>Subject</description>
+                                <required>false</required>
+                                <authoritative_list>
+                                    <item>
+                                        <field>image</field>
+                                        <value>image</value>
+                                    </item>
+                                    <item>
+                                        <field>photograph</field>
+                                        <value>photograph</value>
+                                    </item>
+                                    <item>
+                                        <field>presentation</field>
+                                        <value>presentation</value>
+                                    </item>
+                                    <item>
+                                        <field>art</field>
+                                        <value>art</value>
+                                    </item>
+                                </authoritative_list>
+                            </element>
+                            <element>
+                                <label>Description</label>
+                                <name>dc:description</name>
+                                <type>textarea</type>
+                                <description>Description of the Image</description>
+                                <required>true</required>
+                            </element>
+                            <element>
+                                <label>Publisher</label>
+                                <name>dc:publisher</name>
+                                <type>textfield</type>
+                                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Contributor</label>
+                                <name>dc:contributor</name>
+                                <type>textfield</type>
+                                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Date</label>
+                                <name>dc:date</name>
+                                <type>textfield</type>
+                                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Resource Type</label>
+                                <name>dc:type</name>
+                                <type>textfield</type>
+                                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Source</label>
+                                <name>dc:source</name>
+                                <type>textfield</type>
+                                <description>A reference to a resource from which the present resource is derived.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Identifier</label>
+                                <name>dc:identifier</name>
+                                <type>textfield</type>
+                                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Language</label>
+                                <name>dc:language</name>
+                                <type>select</type>
+                                <description>The language of the intellectual content of the resource.</description>
+                                <required>false</required>
+                                <authoritative_list>
+                                    <item>
+                                        <field>eng</field>
+                                        <value>English</value>
+                                    </item>
+                                    <item>
+                                        <field>fre</field>
+                                        <value>French</value>
+                                    </item>
+                                </authoritative_list>
+                            </element>
+                            <element>
+                                <label>Relation</label>
+                                <name>dc:relation</name>
+                                <type>textfield</type>
+                                <description>Reference to a related resource.</description>
+                                <required>false</required>
+                            </element>
+                            <element>
+                                <label>Rights Management</label>
+                                <name>dc:rights</name>
+                                <type>textarea</type>
+                                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+                                <required>false</required>
+                            </element>
+                        </form_elements>
+                    </ingest_form>
+                </content_model>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-09-16T16:13:49.927Z" ID="ISLANDORACM.1"
       LABEL="Islandora Content Model Object" MIMETYPE="text/xml" SIZE="4279">
-      <foxml:xmlContent>
-        <content_model name="Standard_Map" xmlns="http://www.islandora.ca"
+            <foxml:xmlContent>
+                <content_model name="Standard_Map" xmlns="http://www.islandora.ca"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
-          <mimetypes>
-            <type>image/tiff</type>
-            <type>image/tif</type>
-          </mimetypes>
-          <ingest_rules>
-            <rule>
-              <applies_to>image/tiff</applies_to>
-              <applies_to>image/tif</applies_to>
-              <ingest_methods>
-                <ingest_method class="ImageManipulation" dsid="JP2" file="plugins/ImageManipulation.inc"
+                    <mimetypes>
+                        <type>image/tiff</type>
+                        <type>image/tif</type>
+                    </mimetypes>
+                    <ingest_rules>
+                        <rule>
+                            <applies_to>image/tiff</applies_to>
+                            <applies_to>image/tif</applies_to>
+                            <ingest_methods>
+                                <ingest_method class="ImageManipulation" dsid="JP2" file="plugins/ImageManipulation.inc"
                   method="createJP2" modified_files_ext="jp2" module=""/>
-              </ingest_methods>
-            </rule>
-          </ingest_rules>
-          <datastreams>
-            <datastream dsid="JPG">
-              <display_method class="ShowMapStreamsInFieldSets" file="plugins/map_viewer.inc" method="showJPG" module=""/>
-            </datastream>
-            <datastream dsid="JP2"/>
-            <datastream dsid="FULL_SIZE"/>
-            <datastream dsid="FULL_JPG"/>
-            <datastream dsid="DC"/>
-            <datastream dsid="MODS"/>
-          </datastreams>
-          <ingest_form dsid="QDC" page="2">
-            <form_builder_method class="DemoFormBuilder" file="plugins/DemoFormBuilder.inc" handler="handleQDCForm"
+                            </ingest_methods>
+                        </rule>
+                    </ingest_rules>
+                    <datastreams>
+                        <datastream dsid="JPG">
+                            <display_method class="ShowMapStreamsInFieldSets" file="plugins/map_viewer.inc" method="showJPG" module=""/>
+                        </datastream>
+                        <datastream dsid="JP2"/>
+                        <datastream dsid="FULL_SIZE"/>
+                        <datastream dsid="FULL_JPG"/>
+                        <datastream dsid="DC"/>
+                        <datastream dsid="MODS"/>
+                    </datastreams>
+                    <ingest_form dsid="QDC" page="2">
+                        <form_builder_method class="DemoFormBuilder" file="plugins/DemoFormBuilder.inc" handler="handleQDCForm"
               method="buildQDCForm" module=""/>
-            <form_elements>
-              <element label="Title/Caption/Image Name" name="dc:title" required="true" type="textfield">
-                <description>The name given to the resource</description>
-              </element>
-              <element label="Creator/Photographer" name="dc:creator" type="textfield">
-                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
-              </element>
-              <element label="Subject" name="dc:subject" type="select">
-                <description>Subject</description>
-                <authoritative_list>
-                  <item>image</item>
-                  <item>photograph</item>
-                  <item>presentation</item>
-                  <item>art</item>
-                </authoritative_list>
-              </element>
-              <element label="Description" name="dc:description" required="true" type="textarea">
-                <description>Description of the Image</description>
-              </element>
-              <element label="Publisher" name="dc:publisher" type="textfield">
-                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
-              </element>
-              <element label="Contributor" name="dc:contributor" type="textfield">
-                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
-              </element>
-              <element label="Date" name="dc:date" type="textfield">
-                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
-              </element>
-              <element label="Resource Type" name="dc:type" type="textfield">
-                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
-              </element>
-              <element label="Source" name="dc:source" type="textfield">
-                <description>A reference to a resource from which the present resource is derived.</description>
-              </element>
-              <element label="Identifier" name="dc:identifier" type="textfield">
-                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
-              </element>
-              <element label="Language" name="dc:language" type="select">
-                <description>The language of the intellectual content of the resource.</description>
-                <authoritative_list>
-                  <item field="eng">English</item>
-                  <item field="fre">French</item>
-                </authoritative_list>
-              </element>
-              <element label="Relation" name="dc:relation" type="textfield">
-                <description>Reference to a related resource.</description>
-              </element>
-              <element label="Rights Management" name="dc:rights" type="textarea">
-                <description>Information about intellectual property rights, copyright, and various property rights.</description>
-              </element>
-            </form_elements>
-          </ingest_form>
-        </content_model>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                        <form_elements>
+                            <element label="Title/Caption/Image Name" name="dc:title" required="true" type="textfield">
+                                <description>The name given to the resource</description>
+                            </element>
+                            <element label="Creator/Photographer" name="dc:creator" type="textfield">
+                                <description>An entity primarily responsible for making the content of the resource such as a person, organization or service.</description>
+                            </element>
+                            <element label="Subject" name="dc:subject" type="select">
+                                <description>Subject</description>
+                                <authoritative_list>
+                                    <item>image</item>
+                                    <item>photograph</item>
+                                    <item>presentation</item>
+                                    <item>art</item>
+                                </authoritative_list>
+                            </element>
+                            <element label="Description" name="dc:description" required="true" type="textarea">
+                                <description>Description of the Image</description>
+                            </element>
+                            <element label="Publisher" name="dc:publisher" type="textfield">
+                                <description>An entity, (including persons, organizations, or services), responsible for making the resource available.</description>
+                            </element>
+                            <element label="Contributor" name="dc:contributor" type="textfield">
+                                <description>An entity responsible for contributing to the content of the resource such as a person, organization or service.</description>
+                            </element>
+                            <element label="Date" name="dc:date" type="textfield">
+                                <description>Temporal scope of the content if known. Date format is YYYY-MM-DD (e.g. 1890,1910-10,or 2007-10-23)</description>
+                            </element>
+                            <element label="Resource Type" name="dc:type" type="textfield">
+                                <description>Genre of the content of the resource. Examples include: home page, novel, poem, working paper, technical report, essay, dictionary.</description>
+                            </element>
+                            <element label="Source" name="dc:source" type="textfield">
+                                <description>A reference to a resource from which the present resource is derived.</description>
+                            </element>
+                            <element label="Identifier" name="dc:identifier" type="textfield">
+                                <description>A unique reference to the resource; In this instance, the accession number or collection number.</description>
+                            </element>
+                            <element label="Language" name="dc:language" type="select">
+                                <description>The language of the intellectual content of the resource.</description>
+                                <authoritative_list>
+                                    <item field="eng">English</item>
+                                    <item field="fre">French</item>
+                                </authoritative_list>
+                            </element>
+                            <element label="Relation" name="dc:relation" type="textfield">
+                                <description>Reference to a related resource.</description>
+                            </element>
+                            <element label="Rights Management" name="dc:rights" type="textarea">
+                                <description>Information about intellectual property rights, copyright, and various property rights.</description>
+                            </element>
+                        </form_elements>
+                    </ingest_form>
+                </content_model>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_mods2htmlSdef.xml

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="islandora:mods2htmlSdef" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="MODS to HTML Disseminator"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-03-12T14:57:03.509Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:13.492Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.509Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="MODS to HTML Disseminator"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-03-12T14:57:03.509Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-25T13:17:13.492Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.509Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T14:57:03.509Z</audit:date>
-            <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>METHODMAP</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:12:03.341Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T17:28:34.323Z</audit:date>
-            <audit:justification>Ingested from local file /Users/aoneill/fedora_repository/content_models/islandora-mods2htmlSdef.xml</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-05-25T13:17:13.492Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.602Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T14:57:03.509Z</audit:date>
+                        <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>METHODMAP</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:12:03.341Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T17:28:34.323Z</audit:date>
+                        <audit:justification>Ingested from local file /Users/aoneill/fedora_repository/content_models/islandora-mods2htmlSdef.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-05-25T13:17:13.492Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.602Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="372">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdef">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.602Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdef">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDefinition-3.0"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.602Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP1.0" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="1005">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="Fedora MethodMap for SDef" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <fmm:MethodMap name="Fedora MethodMap for SDef" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <comment xmlns="info:fedora/fedora-system:def/comment#">
             This METHODMAP datastream is included as a starting point to
               assist in the creation of a service definition. The METHODMAP
               should define the methods and method parameters for this
@@ -79,32 +79,32 @@
               demo:1, demo:12, demo: 19, and demo:27.
             For more information about the demonstration objects, see:
               http://fedora-commons.org/confluence/x/AwFI.
-          </comment>
-          <fmm:Method operationName="changeme"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-12T15:12:03.341Z"
+                    </comment>
+                    <fmm:Method operationName="changeme"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-12T15:12:03.341Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDefMethodMap-1.0" ID="METHODMAP.1" LABEL="Abstract Method Map"
       MIMETYPE="text/xml" SIZE="181">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="mods2html"/>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.509Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="mods2html"/>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T14:57:03.509Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="401">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>MODS to HTML Disseminator</dc:title>
-          <dc:identifier>islandora:mods2htmlSdef</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <dc:title>MODS to HTML Disseminator</dc:title>
+                    <dc:identifier>islandora:mods2htmlSdef</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_mods2htmlSdep.xml

@@ -1,188 +1,188 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="islandora:mods2htmlSdep" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="MODS to HTML Disseminator Service Deployment"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-03-12T15:14:29.138Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T01:05:17.111Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.138Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="MODS to HTML Disseminator Service Deployment"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-03-12T15:14:29.138Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-06-01T01:05:17.111Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.138Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:14:29.138Z</audit:date>
-            <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>addDatastream</audit:action>
-            <audit:componentID>XSL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:17:20.270Z</audit:date>
-            <audit:justification>DatastreamsPane generated this logMessage.</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:18:27.234Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>METHODMAP</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:21:44.430Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC5">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>DSINPUTSPEC</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:23:21.361Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC6">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>WSDL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-12T15:27:58.299Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC7">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>admin</audit:responsibility>
-            <audit:date>2010-05-25T13:17:13.612Z</audit:date>
-            <audit:justification>Fedora Object Ingested</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC8">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-06-01T01:05:17.111Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:14:29.138Z</audit:date>
+                        <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>addDatastream</audit:action>
+                        <audit:componentID>XSL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:17:20.270Z</audit:date>
+                        <audit:justification>DatastreamsPane generated this logMessage.</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:18:27.234Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>METHODMAP</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:21:44.430Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC5">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>DSINPUTSPEC</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:23:21.361Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC6">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>WSDL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-12T15:27:58.299Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC7">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2010-05-25T13:17:13.612Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC8">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-06-01T01:05:17.111Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="612">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
-            <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"/>
-            <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-12T15:18:27.234Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
+                        <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"/>
+                        <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-12T15:18:27.234Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.1" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="613">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/islandora:mods2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-06-01T01:05:17.111Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/islandora:mods2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-06-01T01:05:17.111Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.2" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="698">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/islandora:mods2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/newspapers:issueCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:mods2htmlSdep">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/islandora:mods2htmlSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/newspapers:issueCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP1.0" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="298">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This METHODMAP datastream is included as a starting point to
           assist in the creation of a service deployment. The METHODMAP
           should define the the mapping of the WSDL to Fedora object methods.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-12T15:21:44.430Z"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-12T15:21:44.430Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP.1" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="698">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="mods2html" wsdlMsgName="mods2htmlRequestMsg" wsdlMsgOutput="response">
-            <fmm:DatastreamInputParm parmName="MODS" passBy="URL_REF" required="true"/>
-            <fmm:DatastreamInputParm parmName="XSL" passBy="URL_REF" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="text/html"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="mods2html" wsdlMsgName="mods2htmlRequestMsg" wsdlMsgOutput="response">
+                        <fmm:DatastreamInputParm parmName="MODS" passBy="URL_REF" required="true"/>
+                        <fmm:DatastreamInputParm parmName="XSL" passBy="URL_REF" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="response" wsdlMsgTOMIME="text/html"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.172Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC1.0"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="300">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This DSINPUTSPEC datastream is included as a starting point to
           assist in the creation of a service deployment. The DSINPUTSPEC
           should define the datastreams to be used by WSDL-defined methods.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-12T15:23:21.361Z"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-12T15:23:21.361Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC.1"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="714">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="mods2htmlSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="MODS">
-            <fbs:DSInputLabel>MODS</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" pid="islandora:mods2htmlSdep" wsdlMsgPartName="XSL">
-            <fbs:DSInputLabel>XSL</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.178Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="mods2htmlSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="MODS">
+                        <fbs:DSInputLabel>MODS</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" pid="islandora:mods2htmlSdep" wsdlMsgPartName="XSL">
+                        <fbs:DSInputLabel>XSL</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.178Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL1.0" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="752">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This WSDL datastream is included as a starting point to
             assist in the creation of a service deployment. The WSDL
             should define the services provided by this
@@ -194,271 +194,279 @@
             demo:2, demo:13, demo:20, and demo:28.
           For more information about the demonstration objects, see:
             http://fedora-commons.org/confluence/x/AwFI.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-12T15:27:58.299Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-12T15:27:58.299Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.1" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="1953">
-      <foxml:xmlContent>
-        <wsdl:definitions name="mods2htmlSdep" targetNamespace="mods2htmlSdep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="mods2htmlSdep" targetNamespace="mods2htmlSdep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="mods2htmlSdep"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="mods2htmlRequestMsg">
-            <wsdl:part name="MODS" type="xsd:string"/>
-            <wsdl:part name="XSL" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="response">
-            <wsdl:part name="exhibit" type="xsd:base64Binary"/>
-          </wsdl:message>
-          <wsdl:portType name="mods2html_portType">
-            <wsdl:operation name="mods2html">
-              <wsdl:input message="this:mods2htmlRequestMsg"/>
-              <wsdl:output message="this:response"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="mods2html_service">
-            <wsdl:port binding="this:mods2html_binding" name="mods2html_port">
-              <http:address location="http://local.fedora.server/saxon/"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="mods2html_binding" type="this:mods2html_portType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="mods2html">
-              <http:operation location="SaxonServlet?source=(MODS)&amp;style=(XSL)&amp;clear-stylesheet-cache=yes"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/html"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.138Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+                    <wsdl:message name="mods2htmlRequestMsg">
+                        <wsdl:part name="MODS" type="xsd:string"/>
+                        <wsdl:part name="XSL" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="response">
+                        <wsdl:part name="exhibit" type="xsd:base64Binary"/>
+                    </wsdl:message>
+                    <wsdl:portType name="mods2html_portType">
+                        <wsdl:operation name="mods2html">
+                            <wsdl:input message="this:mods2htmlRequestMsg"/>
+                            <wsdl:output message="this:response"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="mods2html_service">
+                        <wsdl:port binding="this:mods2html_binding" name="mods2html_port">
+                            <http:address location="http://local.fedora.server/saxon/"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="mods2html_binding" type="this:mods2html_portType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="mods2html">
+                            <http:operation location="SaxonServlet?source=(MODS)&amp;style=(XSL)&amp;clear-stylesheet-cache=yes"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/html"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:14:29.138Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="420">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>MODS to HTML Disseminator Service Deployment</dc:title>
-          <dc:identifier>islandora:mods2htmlSdep</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="XSL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2010-03-12T15:17:20.270Z" ID="XSL.0"
+                    <dc:title>MODS to HTML Disseminator Service Deployment</dc:title>
+                    <dc:identifier>islandora:mods2htmlSdep</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="XSL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2010-03-12T15:17:20.270Z" ID="XSL.0"
       LABEL="MODS to HTML XSLT Transformation Stylesheet" MIMETYPE="text/xml" SIZE="8864">
-      <foxml:xmlContent>
-        <xsl:stylesheet exclude-result-prefixes="mods" version="1.0" xmlns:mods="http://www.loc.gov/mods/v3"
+            <foxml:xmlContent>
+                <xsl:stylesheet exclude-result-prefixes="mods" version="1.0" xmlns:mods="http://www.loc.gov/mods/v3"
           xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-          <xsl:output indent="yes" method="html"/>
-          <xsl:variable name="dictionary" select="document('http://www.loc.gov/standards/mods/modsDictionary.xml')/dictionary"/>
-          <xsl:template match="/">
-            <html>
-              <head>
-                <style type="text/css">TD {vertical-align:top}</style>
-              </head>
-              <body>
-                <xsl:choose>
-                  <xsl:when test="mods:modsCollection">
-                    <xsl:apply-templates select="mods:modsCollection"/>
-                  </xsl:when>
-                  <xsl:when test="mods:mods">
-                    <xsl:apply-templates select="mods:mods"/>
-                  </xsl:when>
-                </xsl:choose>
-              </body>
-            </html>
-          </xsl:template>
-          <xsl:template match="mods:modsCollection">
-            <xsl:apply-templates select="mods:mods"/>
-          </xsl:template>
-          <xsl:template match="mods:mods">
-            <table>
-              <xsl:apply-templates/>
-            </table>
-            <hr/>
-          </xsl:template>
-          <xsl:template match="*">
-            <xsl:choose>
-              <xsl:when test="child::*">
-                <tr>
-                  <td colspan="2">
-                    <b>
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </b>
-                  </td>
-                </tr>
-                <xsl:apply-templates mode="level2"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <tr>
-                  <td width="300pt">
-                    <b>
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </b>
-                  </td>
-                  <td>
-                    <xsl:call-template name="formatValue"/>
-                  </td>
-                </tr>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template name="formatValue">
-            <xsl:choose>
-              <xsl:when test="@type='uri'">
-                <a href="{text()}">
-                  <xsl:value-of select="text()"/>
-                </a>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="text()"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template match="*" mode="level2">
-            <xsl:choose>
-              <xsl:when test="child::*">
-                <tr>
-                  <td colspan="2">
-                    <p style="margin-left: 1em">
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </p>
-                  </td>
-                </tr>
-                <xsl:apply-templates mode="level3"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <tr>
-                  <td>
-                    <p style="margin-left: 1em">
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </p>
-                  </td>
-                  <td>
-                    <xsl:call-template name="formatValue"/>
-                  </td>
-                </tr>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template match="*" mode="level3">
-            <xsl:choose>
-              <xsl:when test="child::*">
-                <tr>
-                  <td colspan="2">
-                    <p style="margin-left: 2em">
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </p>
-                  </td>
-                </tr>
-                <xsl:apply-templates mode="level4"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <tr>
-                  <td>
-                    <p style="margin-left: 2em">
-                      <xsl:call-template name="longName">
-                        <xsl:with-param name="name">
-                          <xsl:value-of select="local-name()"/>
-                        </xsl:with-param>
-                      </xsl:call-template>
-                      <xsl:call-template name="attr"/>
-                    </p>
-                  </td>
-                  <td>
-                    <xsl:call-template name="formatValue"/>
-                  </td>
-                </tr>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template match="*" mode="level4">
-            <tr>
-              <td>
-                <p style="margin-left: 3em">
-                  <xsl:call-template name="longName">
-                    <xsl:with-param name="name">
-                      <xsl:value-of select="local-name()"/>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="attr"/>
-                </p>
-              </td>
-              <td>
-                <xsl:value-of select="text()"/>
-              </td>
-            </tr>
-          </xsl:template>
-          <xsl:template name="longName">
-            <xsl:param name="name"/>
-            <xsl:choose>
-              <xsl:when test="$dictionary/entry[@key=$name]">
-                <xsl:value-of select="$dictionary/entry[@key=$name]"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$name"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:template>
-          <xsl:template name="attr">
-            <xsl:for-each select="@type|@point">:<xsl:call-template name="longName">
-                <xsl:with-param name="name">
-                  <xsl:value-of select="."/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:for-each>
-            <xsl:if test="@authority or @edition">
-              <xsl:for-each select="@authority">(<xsl:call-template name="longName">
-                  <xsl:with-param name="name">
-                    <xsl:value-of select="."/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:for-each>
-              <xsl:if test="@edition">Edition <xsl:value-of select="@edition"/>
-              </xsl:if>)</xsl:if>
-            <xsl:variable name="attrStr">
-              <xsl:for-each select="@*[local-name()!='edition' and local-name()!='type' and local-name()!='authority' and local-name()!='point']">
-                <xsl:value-of select="local-name()"/>="<xsl:value-of select="."/>",</xsl:for-each>
-            </xsl:variable>
-            <xsl:variable name="nattrStr" select="normalize-space($attrStr)"/>
-            <xsl:if test="string-length($nattrStr)">(<xsl:value-of select="substring($nattrStr,1,string-length($nattrStr)-1)"/>)</xsl:if>
-          </xsl:template>
-        </xsl:stylesheet>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <xsl:output indent="yes" method="html"/>
+                    <xsl:variable name="dictionary" select="document('http://www.loc.gov/standards/mods/modsDictionary.xml')/dictionary"/>
+                    <xsl:template match="/">
+                        <html>
+                            <head>
+                                <style type="text/css">TD {vertical-align:top}</style>
+                            </head>
+                            <body>
+                                <xsl:choose>
+                                    <xsl:when test="mods:modsCollection">
+                                        <xsl:apply-templates select="mods:modsCollection"/>
+                                    </xsl:when>
+                                    <xsl:when test="mods:mods">
+                                        <xsl:apply-templates select="mods:mods"/>
+                                    </xsl:when>
+                                </xsl:choose>
+                            </body>
+                        </html>
+                    </xsl:template>
+                    <xsl:template match="mods:modsCollection">
+                        <xsl:apply-templates select="mods:mods"/>
+                    </xsl:template>
+                    <xsl:template match="mods:mods">
+                        <table>
+                            <xsl:apply-templates/>
+                        </table>
+                        <hr/>
+                    </xsl:template>
+                    <xsl:template match="*">
+                        <xsl:choose>
+                            <xsl:when test="child::*">
+                                <tr>
+                                    <td colspan="2">
+                                        <b>
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </b>
+                                    </td>
+                                </tr>
+                                <xsl:apply-templates mode="level2"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <tr>
+                                    <td width="300pt">
+                                        <b>
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </b>
+                                    </td>
+                                    <td>
+                                        <xsl:call-template name="formatValue"/>
+                                    </td>
+                                </tr>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template name="formatValue">
+                        <xsl:choose>
+                            <xsl:when test="@type='uri'">
+                                <a href="{text()}">
+                                    <xsl:value-of select="text()"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="text()"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template match="*" mode="level2">
+                        <xsl:choose>
+                            <xsl:when test="child::*">
+                                <tr>
+                                    <td colspan="2">
+                                        <p style="margin-left: 1em">
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </p>
+                                    </td>
+                                </tr>
+                                <xsl:apply-templates mode="level3"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <tr>
+                                    <td>
+                                        <p style="margin-left: 1em">
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </p>
+                                    </td>
+                                    <td>
+                                        <xsl:call-template name="formatValue"/>
+                                    </td>
+                                </tr>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template match="*" mode="level3">
+                        <xsl:choose>
+                            <xsl:when test="child::*">
+                                <tr>
+                                    <td colspan="2">
+                                        <p style="margin-left: 2em">
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </p>
+                                    </td>
+                                </tr>
+                                <xsl:apply-templates mode="level4"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <tr>
+                                    <td>
+                                        <p style="margin-left: 2em">
+                                            <xsl:call-template name="longName">
+                                                <xsl:with-param name="name">
+                                                    <xsl:value-of select="local-name()"/>
+                                                </xsl:with-param>
+                                            </xsl:call-template>
+                                            <xsl:call-template name="attr"/>
+                                        </p>
+                                    </td>
+                                    <td>
+                                        <xsl:call-template name="formatValue"/>
+                                    </td>
+                                </tr>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template match="*" mode="level4">
+                        <tr>
+                            <td>
+                                <p style="margin-left: 3em">
+                                    <xsl:call-template name="longName">
+                                        <xsl:with-param name="name">
+                                            <xsl:value-of select="local-name()"/>
+                                        </xsl:with-param>
+                                    </xsl:call-template>
+                                    <xsl:call-template name="attr"/>
+                                </p>
+                            </td>
+                            <td>
+                                <xsl:value-of select="text()"/>
+                            </td>
+                        </tr>
+                    </xsl:template>
+                    <xsl:template name="longName">
+                        <xsl:param name="name"/>
+                        <xsl:choose>
+                            <xsl:when test="$dictionary/entry[@key=$name]">
+                                <xsl:value-of select="$dictionary/entry[@key=$name]"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:value-of select="$name"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:template>
+                    <xsl:template name="attr">
+                        <xsl:for-each select="@type|@point">:
+                            <xsl:call-template name="longName">
+                                <xsl:with-param name="name">
+                                    <xsl:value-of select="."/>
+                                </xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:for-each>
+                        <xsl:if test="@authority or @edition">
+                            <xsl:for-each select="@authority">(
+                                <xsl:call-template name="longName">
+                                    <xsl:with-param name="name">
+                                        <xsl:value-of select="."/>
+                                    </xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:for-each>
+                            <xsl:if test="@edition">Edition
+                                <xsl:value-of select="@edition"/>
+                            </xsl:if>)
+                        </xsl:if>
+                        <xsl:variable name="attrStr">
+                            <xsl:for-each select="@*[local-name()!='edition' and local-name()!='type' and local-name()!='authority' and local-name()!='point']">
+                                <xsl:value-of select="local-name()"/>="
+                                <xsl:value-of select="."/>",
+                            </xsl:for-each>
+                        </xsl:variable>
+                        <xsl:variable name="nattrStr" select="normalize-space($attrStr)"/>
+                        <xsl:if test="string-length($nattrStr)">(
+                            <xsl:value-of select="substring($nattrStr,1,string-length($nattrStr)-1)"/>)
+                        </xsl:if>
+                    </xsl:template>
+                </xsl:stylesheet>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_qtCModel.xml

@@ -3,161 +3,172 @@
 xmlns:foxml="info:fedora/fedora-system:def/foxml#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Generic Content Model for Fedora Attach"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-01-26T21:29:20.416Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-03-11T21:01:44.921Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2010-01-26T21:29:20.416Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="396">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>Quicktime Content Model</dc:title>
-  <dc:identifier>islandora:qtCModel</dc:identifier> 
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="ISLANDORACM" CONTROL_GROUP="X" STATE="A" >
-  <foxml:datastreamVersion ID="ISLANDORACM.0" MIMETYPE="application/xml" LABEL="ISLANDORACM.0">
-    <foxml:xmlContent>
-<content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard_qt" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
-  <mimetypes>
-    <type>video/quicktime</type>
-    <type>video/mp4</type>
-    <type>audio/mp3</type>
-    <type>audio/x-aiff</type>
-  </mimetypes>
-  <ingest_rules>
-    <rule>
-      <applies_to>video/quicktime</applies_to>
-      <applies_to>video/mp4</applies_to>
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Generic Content Model for Fedora Attach"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2010-01-26T21:29:20.416Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-03-11T21:01:44.921Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2010-01-26T21:29:20.416Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="396">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>Quicktime Content Model</dc:title>
+                    <dc:identifier>islandora:qtCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="ISLANDORACM" CONTROL_GROUP="X" STATE="A" >
+        <foxml:datastreamVersion ID="ISLANDORACM.0" MIMETYPE="application/xml" LABEL="ISLANDORACM.0">
+            <foxml:xmlContent>
+                <content_model xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard_qt" xsi:schemaLocation="http://www.islandora.ca http://localhost/islandoracm.xsd">
+                    <mimetypes>
+                        <type>video/quicktime</type>
+                        <type>video/mp4</type>
+                        <type>audio/mp3</type>
+                        <type>audio/x-aiff</type>
+                    </mimetypes>
+                    <ingest_rules>
+                        <rule>
+                            <applies_to>video/quicktime</applies_to>
+                            <applies_to>video/mp4</applies_to>
 
-      <applies_to>audio/mp3</applies_to>
-      <applies_to>audio/x-aiff</applies_to>
-      <ingest_methods>
-        <ingest_method file="plugins/Exiftool.inc" class="Exiftool" method="extractMetadata" dsid="OBJ_EXIFTOOL" modified_files_ext="">
-          <parameters></parameters>
-        </ingest_method>
+                            <applies_to>audio/mp3</applies_to>
+                            <applies_to>audio/x-aiff</applies_to>
+                            <ingest_methods>
+                                <ingest_method file="plugins/Exiftool.inc" class="Exiftool" method="extractMetadata" dsid="OBJ_EXIFTOOL" modified_files_ext="">
+                                    <parameters></parameters>
+                                </ingest_method>
 
-        <ingest_method class="Ffmpeg" dsid="FULL_SIZE" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
-          <parameters>
-          </parameters>
-        </ingest_method>
+                                <ingest_method class="Ffmpeg" dsid="FULL_SIZE" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
+                                    <parameters>
+                                    </parameters>
+                                </ingest_method>
 
-        <ingest_method class="Ffmpeg" dsid="TN" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
-          <parameters>
-            <parameter name="s">92x92</parameter>
-          </parameters>
-        </ingest_method>
-      </ingest_methods>
-    </rule>
-  </ingest_rules>
-  <datastreams>
-    <datastream dsid="OBJ">
-      <display_method class="ShowQtStreamsInFieldSets" file="plugins/qt_viewer.inc" method="showQt" module=""></display_method>
-    </datastream>
-    <datastream dsid="PROXY"></datastream>
-    <datastream dsid="OBJ_EXIFTOOL"></datastream>
-    <datastream dsid="TN"></datastream>
-    <datastream dsid="FULL_SIZE"></datastream>
-    <datastream dsid="QDC">
-      <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showQdc" module=""></display_method>
-    </datastream>
-  </datastreams>
-  <ingest_form dsid="QDC" page="2">
-    <form_builder_method class="QtFormBuilder" file="plugins/QtFormBuilder.php" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
-    <form_elements>
-      <element label="Title/Caption/Media Name" name="dc:title" required="true" type="textfield">
-        <description>The name given to the file</description>
-      </element>
-      <element label="Creator/" name="dc:creator" type="textfield">
-        <description>An entity primarily responsible for making the
+                                <ingest_method class="Ffmpeg" dsid="TN" file="plugins/Ffmpeg.inc" method="extract_thumbnail" modified_files_ext="jpg">
+                                    <parameters>
+                                        <parameter name="s">92x92</parameter>
+                                    </parameters>
+                                </ingest_method>
+                            </ingest_methods>
+                        </rule>
+                    </ingest_rules>
+                    <datastreams>
+                        <datastream dsid="OBJ">
+                            <display_method class="ShowQtStreamsInFieldSets" file="plugins/qt_viewer.inc" method="showQt" module=""></display_method>
+                        </datastream>
+                        <datastream dsid="PROXY"></datastream>
+                        <datastream dsid="OBJ_EXIFTOOL"></datastream>
+                        <datastream dsid="TN"></datastream>
+                        <datastream dsid="FULL_SIZE"></datastream>
+                        <datastream dsid="QDC">
+                            <display_method class="ShowStreamsInFieldSets" file="plugins/ShowStreamsInFieldSets.inc" method="showQdc" module=""></display_method>
+                        </datastream>
+                    </datastreams>
+                    <ingest_form dsid="QDC" page="2">
+                        <form_builder_method class="QtFormBuilder" file="plugins/QtFormBuilder.php" handler="handleQDCForm" method="buildQDCForm" module=""></form_builder_method>
+                        <form_elements>
+                            <element label="Title/Caption/Media Name" name="dc:title" required="true" type="textfield">
+                                <description>The name given to the file</description>
+                            </element>
+                            <element label="Creator/" name="dc:creator" type="textfield">
+                                <description>An entity primarily responsible for making the
         content of the resource such as a person, organization or
-        service.</description>
-      </element>
-      <element label="Subject" name="dc:subject" type="select">
-        <description>An entity primarily responsible for making the
+        service.
+                                </description>
+                            </element>
+                            <element label="Subject" name="dc:subject" type="select">
+                                <description>An entity primarily responsible for making the
         content of the resource such as a person, organization or
-        service.</description>
-        <authoritative_list>
-          <item>home recording</item>
-          <item>meeting</item>
-          <item>presentation</item>
-          <item>sound</item>
-        </authoritative_list>
-      </element>
-      <element label="Description of Media" name="dc:description" required="true" type="textarea">
-        <description>Examples include an abstract, table of
+        service.
+                                </description>
+                                <authoritative_list>
+                                    <item>home recording</item>
+                                    <item>meeting</item>
+                                    <item>presentation</item>
+                                    <item>sound</item>
+                                </authoritative_list>
+                            </element>
+                            <element label="Description of Media" name="dc:description" required="true" type="textarea">
+                                <description>Examples include an abstract, table of
         contents, or free-text account of the content of the
-        resource.</description>
-      </element>
-      <element label="Publisher" name="dc:publisher" type="textfield">
-        <description>An entity, (including persons, organizations,
+        resource.
+                                </description>
+                            </element>
+                            <element label="Publisher" name="dc:publisher" type="textfield">
+                                <description>An entity, (including persons, organizations,
         or services), responsible for making the resource
-        available.</description>
-      </element>
-      <element label="Contributor" name="dc:contributor" type="textfield">
-        <description>An entity responsible for contributing to the
+        available.
+                                </description>
+                            </element>
+                            <element label="Contributor" name="dc:contributor" type="textfield">
+                                <description>An entity responsible for contributing to the
         content of the resource such as a person, organization or
-        service.</description>
-      </element>
-      <element label="Date" name="dc:date" type="textfield">
-        <description>Temporal scope of the content if known. Date
+        service.
+                                </description>
+                            </element>
+                            <element label="Date" name="dc:date" type="textfield">
+                                <description>Temporal scope of the content if known. Date
         format is YYYY-MM-DD (e.g. 1890,1910-10,or
-        2007-10-23)</description>
-      </element>
-      <element label="Resource Type" name="dc:type" type="select">
-        <description>Genre of the content of the resource. Examples
+        2007-10-23)
+                                </description>
+                            </element>
+                            <element label="Resource Type" name="dc:type" type="select">
+                                <description>Genre of the content of the resource. Examples
         include: home page, novel, poem, working paper, technical
-        report, essay, dictionary.</description>
-        <authoritative_list>
-          <item>none</item>
-          <item>video</item>
-          <item>event</item>
-          <item>image</item>
-          <item>interactive resource</item>
-          <item>model</item>
-          <item>party</item>
-          <item>physical object</item>
-          <item>place</item>
-          <item>service</item>
-          <item>software</item>
-          <item>sound</item>
-          <item>text</item>
-        </authoritative_list>
-      </element>
-      <element label="Source" name="dc:source" type="textfield">
-        <description>A reference to a resource from which the
-        present resource is derived.</description>
-      </element>
-      <element label="Identifier" name="dc:identifier" type="textfield">
-        <description>A unique reference to the resource; In this
+        report, essay, dictionary.
+                                </description>
+                                <authoritative_list>
+                                    <item>none</item>
+                                    <item>video</item>
+                                    <item>event</item>
+                                    <item>image</item>
+                                    <item>interactive resource</item>
+                                    <item>model</item>
+                                    <item>party</item>
+                                    <item>physical object</item>
+                                    <item>place</item>
+                                    <item>service</item>
+                                    <item>software</item>
+                                    <item>sound</item>
+                                    <item>text</item>
+                                </authoritative_list>
+                            </element>
+                            <element label="Source" name="dc:source" type="textfield">
+                                <description>A reference to a resource from which the
+        present resource is derived.
+                                </description>
+                            </element>
+                            <element label="Identifier" name="dc:identifier" type="textfield">
+                                <description>A unique reference to the resource; In this
         instance, the accession number or collection
-        number.</description>
-      </element>
-      <element label="Language" name="dc:language" type="select">
-        <description>The language of the intellectual content of       
- the resource.</description>
-        <authoritative_list>
-          <item field="eng">English</item>
-          <item field="fre">French</item>
-        </authoritative_list>
-      </element>
-      <element label="Relation" name="dc:relation" type="textfield">
-        <description>Reference to a related resource.</description>
-      </element>
-      <element label="Rights Management" name="dc:rights" type="textarea">
-        <description>Information about intellectual property
+        number.
+                                </description>
+                            </element>
+                            <element label="Language" name="dc:language" type="select">
+                                <description>The language of the intellectual content of
+ the resource.
+                                </description>
+                                <authoritative_list>
+                                    <item field="eng">English</item>
+                                    <item field="fre">French</item>
+                                </authoritative_list>
+                            </element>
+                            <element label="Relation" name="dc:relation" type="textfield">
+                                <description>Reference to a related resource.</description>
+                            </element>
+                            <element label="Rights Management" name="dc:rights" type="textarea">
+                                <description>Information about intellectual property
         rights, copyright, and various property
-        rights.</description>
-      </element>
-    </form_elements>
-  </ingest_form>
-</content_model>
-    </foxml:xmlContent>
-  </foxml:datastreamVersion>
-</foxml:datastream>
+        rights.
+                                </description>
+                            </element>
+                        </form_elements>
+                    </ingest_form>
+                </content_model>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

content_models/islandora_viewerSdep-slideCModel.xml

@@ -1,199 +1,199 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foxml:digitalObject PID="islandora:viewerSdep-slideCModel" VERSION="1.1"
   xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-  <foxml:objectProperties>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="viewerSdep-slideCModel"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-11-27T17:57:45.462Z"/>
-    <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-14T20:05:44.278Z"/>
-  </foxml:objectProperties>
-  <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:45.462Z"
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="viewerSdep-slideCModel"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-11-27T17:57:45.462Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2010-05-14T20:05:44.278Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream CONTROL_GROUP="X" ID="AUDIT" STATE="A" VERSIONABLE="false">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:45.462Z"
       FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit" ID="AUDIT.0" LABEL="Audit Trail for this object" MIMETYPE="text/xml">
-      <foxml:xmlContent>
-        <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-          <audit:record ID="AUDREC1">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>ingest</audit:action>
-            <audit:componentID/>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T17:57:45.462Z</audit:date>
-            <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
-          </audit:record>
-          <audit:record ID="AUDREC2">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T18:02:20.095Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC3">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>METHODMAP</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T18:17:31.165Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC4">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>DSINPUTSPEC</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T18:20:50.036Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC5">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>WSDL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T18:22:44.560Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC6">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>WSDL</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2009-11-27T18:37:33.153Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC7">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-03-11T21:01:10.851Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-          <audit:record ID="AUDREC8">
-            <audit:process type="Fedora API-M"/>
-            <audit:action>modifyDatastreamByValue</audit:action>
-            <audit:componentID>RELS-EXT</audit:componentID>
-            <audit:responsibility>fedoraAdmin</audit:responsibility>
-            <audit:date>2010-05-14T20:05:44.278Z</audit:date>
-            <audit:justification/>
-          </audit:record>
-        </audit:auditTrail>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.437Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID/>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T17:57:45.462Z</audit:date>
+                        <audit:justification>Created with Admin GUI "New Object" command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:02:20.095Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>METHODMAP</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:17:31.165Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>DSINPUTSPEC</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:20:50.036Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC5">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>WSDL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:22:44.560Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC6">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>WSDL</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-11-27T18:37:33.153Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC7">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-03-11T21:01:10.851Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                    <audit:record ID="AUDREC8">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2010-05-14T20:05:44.278Z</audit:date>
+                        <audit:justification/>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.437Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="603">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
-            <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"/>
-            <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2009-11-27T18:02:20.095Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0"/>
+                        <fedora-model:isDeploymentOf rdf:resource="info:fedora/changeme-to-sDefPid"/>
+                        <fedora-model:isContractorOf rdf:resource="info:fedora/changeme-to-cModelPid"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2009-11-27T18:02:20.095Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.1" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="570">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-03-11T21:01:10.851Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-03-11T21:01:10.851Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.2" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="700">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2010-05-14T20:05:44.278Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2010-05-14T20:05:44.278Z" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0"
       ID="RELS-EXT.3" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="831">
-      <foxml:xmlContent>
-        <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
-            <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-            <isContractorOf rdf:resource="info:fedora/islandora:herbCModel" xmlns="info:fedora/fedora-system:def/model#"/>
-          </rdf:Description>
-        </rdf:RDF>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.437Z"
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/islandora:viewerSdep-slideCModel">
+                        <hasModel rdf:resource="info:fedora/fedora-system:ServiceDeployment-3.0" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isDeploymentOf rdf:resource="info:fedora/ilives:viewerSdef" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:slideCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:mapCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                        <isContractorOf rdf:resource="info:fedora/islandora:herbCModel" xmlns="info:fedora/fedora-system:def/model#"/>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="METHODMAP" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.437Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP1.0" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="298">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This METHODMAP datastream is included as a starting point to
           assist in the creation of a service deployment. The METHODMAP
           should define the the mapping of the WSDL to Fedora object methods.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2009-11-27T18:17:31.165Z"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2009-11-27T18:17:31.165Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraSDepMethodMap-1.1" ID="METHODMAP.1" LABEL="Deployment Method Map"
       MIMETYPE="text/xml" SIZE="895">
-      <foxml:xmlContent>
-        <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
-          <fmm:Method operationName="getViewer" wsdlMsgName="getViewerRequestMsg" wsdlMsgOutput="getViewerResponseMsg">
-            <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="islandora:slideCModel" label="content model" parmName="CMODEL"
+            <foxml:xmlContent>
+                <fmm:MethodMap name="methodmap" xmlns:fmm="http://fedora.comm.nsdlib.org/service/methodmap">
+                    <fmm:Method operationName="getViewer" wsdlMsgName="getViewerRequestMsg" wsdlMsgOutput="getViewerResponseMsg">
+                        <fmm:DefaultInputParm defaultValue="$PID" label="fedora object pid" parmName="PID" passBy="VALUE" required="true"/>
+                        <fmm:DefaultInputParm defaultValue="islandora:slideCModel" label="content model" parmName="CMODEL"
               passBy="VALUE" required="true"/>
-            <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
-            <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
-            <fmm:MethodReturnType wsdlMsgName="getViewerResponseMsg" wsdlMsgTOMIME="text/html"/>
-          </fmm:Method>
-        </fmm:MethodMap>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.438Z"
+                        <fmm:DefaultInputParm defaultValue="JP2" label="content model" parmName="DSID" passBy="VALUE" required="true"/>
+                        <fmm:UserInputParm defaultValue="" parmName="uid" passBy="VALUE" required="false"/>
+                        <fmm:MethodReturnType wsdlMsgName="getViewerResponseMsg" wsdlMsgTOMIME="text/html"/>
+                    </fmm:Method>
+                </fmm:MethodMap>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DSINPUTSPEC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.438Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC1.0"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="300">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This DSINPUTSPEC datastream is included as a starting point to
           assist in the creation of a service deployment. The DSINPUTSPEC
           should define the datastreams to be used by WSDL-defined methods.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2009-11-27T18:20:50.036Z"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2009-11-27T18:20:50.036Z"
       FORMAT_URI="info:fedora/fedora-system:FedoraDSInputSpec-1.1" ID="DSINPUTSPEC.1"
       LABEL="Datastream Input Specification" MIMETYPE="text/xml" SIZE="356">
-      <foxml:xmlContent>
-        <fbs:DSInputSpec label="viewerSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
-          <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
-            <fbs:DSInputLabel>DC</fbs:DSInputLabel>
-            <fbs:DSMIME>text/xml</fbs:DSMIME>
-            <fbs:DSInputInstruction/>
-          </fbs:DSInput>
-        </fbs:DSInputSpec>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.443Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+            <foxml:xmlContent>
+                <fbs:DSInputSpec label="viewerSdepInputSpec" xmlns:fbs="http://fedora.comm.nsdlib.org/service/bindspec">
+                    <fbs:DSInput DSMax="1" DSMin="1" DSOrdinality="false" wsdlMsgPartName="DC">
+                        <fbs:DSInputLabel>DC</fbs:DSInputLabel>
+                        <fbs:DSMIME>text/xml</fbs:DSMIME>
+                        <fbs:DSInputInstruction/>
+                    </fbs:DSInput>
+                </fbs:DSInputSpec>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="WSDL" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:46.443Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL1.0" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="752">
-      <foxml:xmlContent>
-        <comment xmlns="info:fedora/fedora-system:def/comment#">
+            <foxml:xmlContent>
+                <comment xmlns="info:fedora/fedora-system:def/comment#">
           This WSDL datastream is included as a starting point to
             assist in the creation of a service deployment. The WSDL
             should define the services provided by this
@@ -205,107 +205,107 @@
             demo:2, demo:13, demo:20, and demo:28.
           For more information about the demonstration objects, see:
             http://fedora-commons.org/confluence/x/AwFI.
-        </comment>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2009-11-27T18:22:44.560Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+                </comment>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2009-11-27T18:22:44.560Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.1" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="1815">
-      <foxml:xmlContent>
-        <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="viewerSdep"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="getViewerRequestMsg">
-            <wsdl:part name="PID" type="xsd:string"/>
-            <wsdl:part name="CMODEL" type="xsd:string"/>
-            <wsdl:part name="DSID" type="xsd:string"/>
-            <wsdl:part name="uid" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="getViewerResponseMsg">
-            <wsdl:part name="RESPONSE" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:portType name="viewer_portType">
-            <wsdl:operation name="getViewer">
-              <wsdl:input message="this:getViewerRequestMsg"/>
-              <wsdl:output message="this:getViewerResponseMsg"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="viewer_service">
-            <wsdl:port binding="this:viewer_binding" name="viewer_port">
-              <http:address location="http://local.fedora.server/iiv/page_viewer.jsp"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="viewer_binding" type="this:viewer_portType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="getViewer">
-              <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/xhtml"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-    <foxml:datastreamVersion CREATED="2009-11-27T18:37:33.153Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
+                    <wsdl:message name="getViewerRequestMsg">
+                        <wsdl:part name="PID" type="xsd:string"/>
+                        <wsdl:part name="CMODEL" type="xsd:string"/>
+                        <wsdl:part name="DSID" type="xsd:string"/>
+                        <wsdl:part name="uid" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="getViewerResponseMsg">
+                        <wsdl:part name="RESPONSE" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:portType name="viewer_portType">
+                        <wsdl:operation name="getViewer">
+                            <wsdl:input message="this:getViewerRequestMsg"/>
+                            <wsdl:output message="this:getViewerResponseMsg"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="viewer_service">
+                        <wsdl:port binding="this:viewer_binding" name="viewer_port">
+                            <http:address location="http://local.fedora.server/iiv/page_viewer.jsp"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="viewer_binding" type="this:viewer_portType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="getViewer">
+                            <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/xhtml"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion CREATED="2009-11-27T18:37:33.153Z" FORMAT_URI="http://schemas.xmlsoap.org/wsdl/"
       ID="WSDL.2" LABEL="WSDL Bindings" MIMETYPE="text/xml" SIZE="1816">
-      <foxml:xmlContent>
-        <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
+            <foxml:xmlContent>
+                <wsdl:definitions name="viewerSdep" targetNamespace="viewerSdep"
           xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap"
           xmlns:soapenc="http://schemas.xmlsoap.org/wsdl/soap/encoding" xmlns:this="viewerSdep"
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          <wsdl:message name="getViewerRequestMsg">
-            <wsdl:part name="PID" type="xsd:string"/>
-            <wsdl:part name="CMODEL" type="xsd:string"/>
-            <wsdl:part name="DSID" type="xsd:string"/>
-            <wsdl:part name="uid" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:message name="getViewerResponseMsg">
-            <wsdl:part name="RESPONSE" type="xsd:string"/>
-          </wsdl:message>
-          <wsdl:portType name="viewer_portType">
-            <wsdl:operation name="getViewer">
-              <wsdl:input message="this:getViewerRequestMsg"/>
-              <wsdl:output message="this:getViewerResponseMsg"/>
-            </wsdl:operation>
-          </wsdl:portType>
-          <wsdl:service name="viewer_service">
-            <wsdl:port binding="this:viewer_binding" name="viewer_port">
-              <http:address location="http://local.fedora.server/iiv/slide_viewer.jsp"/>
-            </wsdl:port>
-          </wsdl:service>
-          <wsdl:binding name="viewer_binding" type="this:viewer_portType">
-            <http:binding verb="GET"/>
-            <wsdl:operation name="getViewer">
-              <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
-              <wsdl:input>
-                <http:urlReplacement/>
-              </wsdl:input>
-              <wsdl:output>
-                <mime:content type="text/xhtml"/>
-              </wsdl:output>
-            </wsdl:operation>
-          </wsdl:binding>
-        </wsdl:definitions>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
-  <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
-    <foxml:datastreamVersion CREATED="2009-11-27T17:57:45.462Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
+                    <wsdl:message name="getViewerRequestMsg">
+                        <wsdl:part name="PID" type="xsd:string"/>
+                        <wsdl:part name="CMODEL" type="xsd:string"/>
+                        <wsdl:part name="DSID" type="xsd:string"/>
+                        <wsdl:part name="uid" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:message name="getViewerResponseMsg">
+                        <wsdl:part name="RESPONSE" type="xsd:string"/>
+                    </wsdl:message>
+                    <wsdl:portType name="viewer_portType">
+                        <wsdl:operation name="getViewer">
+                            <wsdl:input message="this:getViewerRequestMsg"/>
+                            <wsdl:output message="this:getViewerResponseMsg"/>
+                        </wsdl:operation>
+                    </wsdl:portType>
+                    <wsdl:service name="viewer_service">
+                        <wsdl:port binding="this:viewer_binding" name="viewer_port">
+                            <http:address location="http://local.fedora.server/iiv/slide_viewer.jsp"/>
+                        </wsdl:port>
+                    </wsdl:service>
+                    <wsdl:binding name="viewer_binding" type="this:viewer_portType">
+                        <http:binding verb="GET"/>
+                        <wsdl:operation name="getViewer">
+                            <http:operation location="?pid=(PID)&amp;cmodel=(CMODEL)&amp;dsid=(DSID)&amp;uid=(uid)"/>
+                            <wsdl:input>
+                                <http:urlReplacement/>
+                            </wsdl:input>
+                            <wsdl:output>
+                                <mime:content type="text/xhtml"/>
+                            </wsdl:output>
+                        </wsdl:operation>
+                    </wsdl:binding>
+                </wsdl:definitions>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream CONTROL_GROUP="X" ID="DC" STATE="A" VERSIONABLE="true">
+        <foxml:datastreamVersion CREATED="2009-11-27T17:57:45.462Z" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/"
       ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" SIZE="407">
-      <foxml:xmlContent>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/"
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>viewerSdep-slideCModel</dc:title>
-          <dc:identifier>islandora:viewerSdep-slideCModel</dc:identifier>
-        </oai_dc:dc>
-      </foxml:xmlContent>
-    </foxml:datastreamVersion>
-  </foxml:datastream>
+                    <dc:title>viewerSdep-slideCModel</dc:title>
+                    <dc:identifier>islandora:viewerSdep-slideCModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

example_collection_views/MHL-sparqltoHtml.xsl

@@ -1,196 +1,270 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/> 
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">  
-<table cellpadding="3" cellspacing="3">
- <tr><td colspan="{$cellsPerRow}">
-  <div align="center">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div align="center">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when> 
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>        
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>    
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  <br clear="all" />
- </td></tr> 
-  <xsl:apply-templates select="sparql/results"/>
-</table><br clear="all" />
-<div align="center">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
+                <xsl:apply-templates select="sparql/results"/>
+            </table>
+            <br clear="all" />
+            <div align="center">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when> 
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>        
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>    
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
- <xsl:template match="sparql/results">
-   <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-    <tr>
-     <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
-    </tr>  
-   </xsl:for-each>
- </xsl:template>
- <xsl:template match="result">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-  <xsl:call-template name="replace-string">
-   <xsl:with-param name="text" select="title"/> 
-   <xsl:with-param name="from" select="'_'"/>
-   <xsl:with-param name="to" select="' '"/>
-  </xsl:call-template>
-   </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="(content='Collection' or content='Community')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/<xsl:value-of select="title"/>/<xsl:value-of select="title"/>
-     </xsl:otherwise>
-   </xsl:choose>   
-  </xsl:variable>
-  <td valign="top" width="25%">
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
-    </xsl:attribute>   
-   <img>
-    <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-    </xsl:attribute>
-   </img> </a>  <br clear="all" />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
-    </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
-   <xsl:if test="(content!='Collection' and content!='Community')">
-       <br />--<a>
-     <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="sparql/results">
+        <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="result">
+        <xsl:variable name='OBJECTURI' select="object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/
+                    <xsl:value-of select="title"/>/
+                    <xsl:value-of select="title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$linkUrl"/>
+                </xsl:attribute>
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:value-of select="$PID"/>/TN
+                    </xsl:attribute>
+                </img>
+            </a>
+            <br clear="all" />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$linkUrl"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
+            <xsl:if test="(content!='Collection' and content!='Community')">
+                <br />--
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:copy-of select="$PID"/>/-/
+                        <xsl:value-of select="title"/>
+                    </xsl:attribute>
     DETAILS
-    </a>--
-   </xsl:if>
-   </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+                </a>--
+            </xsl:if>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
   
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
     
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
     
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when> 
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>  
-   </xsl:otherwise>
-  </xsl:choose>            
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/critter.xsl

@@ -1,33 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:critters="http://vre.upei.ca/critters/">
- <xsl:output method="xml" omit-xml-declaration="yes"/>
+    <xsl:output method="xml" omit-xml-declaration="yes"/>
  <!-- CRITTER XSLT -->
- <xsl:template match="/">
+    <xsl:template match="/">
 
- <ul>
- <li><b>Date Collected:</b><xsl:text> </xsl:text> <xsl:value-of select="/critters:sample/critters:date_collected"/></li>
- <li><b>Type:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:type"/></li>
- <li><b>Phylum:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:phylum"/></li>
- <li><b>SubPhylum:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:SubPhylum"/></li>
- <li><b>Class:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:class"/></li>
- <li><b>Order:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:order"/></li>
- <li><b>Family:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:family"/></li>
- <li><b>Genus:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:genus"/></li>
- <li><b>Species:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:taxonomy/critters:species"/></li>
+        <ul>
+            <li>
+                <b>Date Collected:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:date_collected"/>
+            </li>
+            <li>
+                <b>Type:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:type"/>
+            </li>
+            <li>
+                <b>Phylum:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:phylum"/>
+            </li>
+            <li>
+                <b>SubPhylum:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:SubPhylum"/>
+            </li>
+            <li>
+                <b>Class:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:class"/>
+            </li>
+            <li>
+                <b>Order:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:order"/>
+            </li>
+            <li>
+                <b>Family:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:family"/>
+            </li>
+            <li>
+                <b>Genus:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:genus"/>
+            </li>
+            <li>
+                <b>Species:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:taxonomy/critters:species"/>
+            </li>
 
- </ul>
+        </ul>
 
- <h4>Collection Location</h4>
- <ul>
- <li><b>Site Name:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:sitename"/></li>
- <li><b>Country:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:country"/></li>
- <li><b>Region:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:region"/></li>
- <li><b>Latitude:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:latitude"/></li>
- <li><b>Longitude:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:longitude"/></li>
- <li><b>Depth:</b> <xsl:text> </xsl:text><xsl:value-of select="/critters:sample/critters:site/critters:depth"/><xsl:text> </xsl:text>Feet</li>
- </ul>
- <h4>Description</h4>
- <div><xsl:value-of select="/critters:sample/critters:description"/></div>
+        <h4>Collection Location</h4>
+        <ul>
+            <li>
+                <b>Site Name:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:sitename"/>
+            </li>
+            <li>
+                <b>Country:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:country"/>
+            </li>
+            <li>
+                <b>Region:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:region"/>
+            </li>
+            <li>
+                <b>Latitude:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:latitude"/>
+            </li>
+            <li>
+                <b>Longitude:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:longitude"/>
+            </li>
+            <li>
+                <b>Depth:</b>
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="/critters:sample/critters:site/critters:depth"/>
+                <xsl:text> </xsl:text>Feet
+            </li>
+        </ul>
+        <h4>Description</h4>
+        <div>
+            <xsl:value-of select="/critters:sample/critters:description"/>
+        </div>
 
- </xsl:template>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/flv-sparqltoHtml.xsl

@@ -1,65 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">
-<table cellpadding="3" cellspacing="3" width="90%">
- <tr><td colspan="{$cellsPerRow}">
-  <div STYLE="text-align: center;">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3" width="90%">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div STYLE="text-align: center;">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when>
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  <br clear="all" />
- </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
 
   <!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
   <xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -79,134 +110,176 @@
    </tr>
   </xsl:for-each>-
  -->
- <xsl:apply-templates select="sparql/results"/>
-</table><br clear="all" />
-<div STYLE="text-align: center;">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                <xsl:apply-templates select="sparql/results"/>
+            </table>
+            <br clear="all" />
+            <div STYLE="text-align: center;">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when>
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
- <xsl:template match="sparql/results">
-   <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-    <tr>
-     <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
-    </tr>
-   </xsl:for-each>
- </xsl:template>
- <xsl:template match="result">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-  <xsl:call-template name="replace-string">
-   <xsl:with-param name="text" select="title"/>
-   <xsl:with-param name="from" select="'_'"/>
-   <xsl:with-param name="to" select="' '"/>
-  </xsl:call-template>
-   </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="(content='Collection' or content='Community')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="title"/>
-     </xsl:otherwise>
-   </xsl:choose>
-  </xsl:variable>
-  <td valign="top" width="25%">
-   <a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>    
-   <img>
-    <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-    </xsl:attribute>
-	<xsl:attribute name="alt"><xsl:value-of select="$newTitle"/>
-    </xsl:attribute>
-   </img> </a>  <br clear="all" />
-   <a>
-    <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="sparql/results">
+        <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="result">
+        <xsl:variable name='OBJECTURI' select="object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/OBJ/
+                    <xsl:value-of select="title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:attribute>
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:value-of select="$PID"/>/TN
+                    </xsl:attribute>
+                    <xsl:attribute name="alt">
+                        <xsl:value-of select="$newTitle"/>
+                    </xsl:attribute>
+                </img>
+            </a>
+            <br clear="all" />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
 
-   </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
 
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
 
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
 
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/mlp-sparqltoHtml.xsl

@@ -1,193 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/> 
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">  
-<table cellpadding="3" cellspacing="3">
- <tr><td colspan="{$cellsPerRow}">
-  <div align="center">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div align="center">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when> 
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>        
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>    
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  <br clear="all" />
- </td></tr> 
- <xsl:apply-templates select="sparql/results"/>
-</table><br clear="all" />
-<div align="center">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
+                <xsl:apply-templates select="sparql/results"/>
+            </table>
+            <br clear="all" />
+            <div align="center">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when> 
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>        
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>    
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
- <xsl:template match="sparql/results">
-   <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-    <tr>
-     <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
-    </tr>  
-   </xsl:for-each>
- </xsl:template>
- <xsl:template match="result">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-  <xsl:call-template name="replace-string">
-   <xsl:with-param name="text" select="title"/> 
-   <xsl:with-param name="from" select="'_'"/>
-   <xsl:with-param name="to" select="' '"/>
-  </xsl:call-template>
-   </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="(content='Collection' or content='Community')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/<xsl:value-of select="title"/>/<xsl:value-of select="title"/>
-     </xsl:otherwise>
-   </xsl:choose>   
-  </xsl:variable>
-  <td valign="top" width="25%">
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="sparql/results">
+        <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="result">
+        <xsl:variable name='OBJECTURI' select="object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/
+                    <xsl:value-of select="title"/>/
+                    <xsl:value-of select="title"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
    
-   <img>
-    <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-    </xsl:attribute>
-   </img>   <br clear="all" />
+            <img>
+                <xsl:attribute name="src">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:value-of select="$PID"/>/TN
+                </xsl:attribute>
+            </img>
+            <br clear="all" />
    
     
-    <xsl:value-of select="$newTitle"/>
+            <xsl:value-of select="$newTitle"/>
   
-   <xsl:if test="(content!='Collection' and content!='Community')">
-       <br />--<a>
-     <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
+            <xsl:if test="(content!='Collection' and content!='Community')">
+                <br />--
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:copy-of select="$PID"/>/-/
+                        <xsl:value-of select="title"/>
+                    </xsl:attribute>
     DETAILS
-    </a>--
-   </xsl:if>
-   </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+                </a>--
+            </xsl:if>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
   
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
     
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
     
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when> 
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>  
-   </xsl:otherwise>
-  </xsl:choose>            
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/refworks.xsl

@@ -1,92 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="xml" omit-xml-declaration="yes"/>
+    <xsl:output method="xml" omit-xml-declaration="yes"/>
  <!-- refworks xslt -->
- <xsl:template match="/">
-  <xsl:if test="/reference/jf">
-   <h2>General Information</h2>
-   <table cellpadding="2" cellspacing="2">
-    <tr><td ><strong>Periodical:</strong></td><td><xsl:value-of select="/reference/jf"/></td></tr>
-    <tr><td><strong>Abbreviation:</strong></td><td><xsl:value-of select="/reference/jo"/></td></tr>
-    <tr><td><strong>Volume:</strong></td><td><xsl:value-of select="/reference/vo"/></td></tr>
-    <tr><td><strong>Issue:</strong></td><td><xsl:value-of select="/reference/is"/></td></tr>
-    <tr><td><strong>Publisher:</strong></td><td><xsl:value-of select="/reference/pb"/></td></tr>
-    <tr><td><strong>Place of Publication:</strong></td><td><xsl:value-of select="/reference/pp"/></td></tr>
-    <tr><td><strong>Edition:</strong></td><td><xsl:value-of select="/reference/ed"/></td></tr>
-    <tr><td><strong>Year:</strong></td><td><xsl:value-of select="/reference/yr"/></td></tr>
-    <tr><td><strong>Date:</strong></td><td><xsl:value-of select="/reference/fd"/></td></tr>
-    <tr><td><strong>Start Page:</strong></td><td><xsl:value-of select="/reference/sp"/></td></tr>
-    <tr><td><strong>Other Pages:</strong></td><td><xsl:value-of select="/reference/op"/></td></tr>
-    <tr><td><strong>ISSN/ISBN:</strong></td><td><xsl:value-of select="/reference/sn"/></td></tr>
-    <tr><td><strong>Language:</strong></td><td><xsl:value-of select="/reference/la"/></td></tr>
-    <tr><td><strong>UL:</strong></td><td><xsl:value-of select="/reference/ul"/></td></tr>
-   </table>
-  </xsl:if>
-  <xsl:if test="/reference/t1">
-  <h2>Titles</h2>
-  <ul>
-   <xsl:for-each select="/reference/t1">
-    <li><xsl:value-of select="."/></li>
-   </xsl:for-each>
-  </ul>
-  </xsl:if>
-  <xsl:if test="/reference/t2">
-      <ul>
-       <h3>Secondary Titles</h3>
-    <xsl:for-each select="/reference/t2">
-     <li><xsl:value-of select="."/></li>
-    </xsl:for-each>
-   </ul>
-  </xsl:if>
-  <xsl:if test="/reference/a1">
-  <h2>Authors</h2>
-  <ul>
-   <xsl:for-each select="/reference/a1">
-    <li><xsl:value-of select="."/></li>
-   </xsl:for-each>
-  </ul>
-   </xsl:if>
+    <xsl:template match="/">
+        <xsl:if test="/reference/jf">
+            <h2>General Information</h2>
+            <table cellpadding="2" cellspacing="2">
+                <tr>
+                    <td >
+                        <strong>Periodical:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/jf"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Abbreviation:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/jo"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Volume:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/vo"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Issue:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/is"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Publisher:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/pb"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Place of Publication:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/pp"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Edition:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/ed"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Year:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/yr"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Date:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/fd"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Start Page:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/sp"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Other Pages:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/op"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>ISSN/ISBN:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/sn"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>Language:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/la"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <strong>UL:</strong>
+                    </td>
+                    <td>
+                        <xsl:value-of select="/reference/ul"/>
+                    </td>
+                </tr>
+            </table>
+        </xsl:if>
+        <xsl:if test="/reference/t1">
+            <h2>Titles</h2>
+            <ul>
+                <xsl:for-each select="/reference/t1">
+                    <li>
+                        <xsl:value-of select="."/>
+                    </li>
+                </xsl:for-each>
+            </ul>
+        </xsl:if>
+        <xsl:if test="/reference/t2">
+            <ul>
+                <h3>Secondary Titles</h3>
+                <xsl:for-each select="/reference/t2">
+                    <li>
+                        <xsl:value-of select="."/>
+                    </li>
+                </xsl:for-each>
+            </ul>
+        </xsl:if>
+        <xsl:if test="/reference/a1">
+            <h2>Authors</h2>
+            <ul>
+                <xsl:for-each select="/reference/a1">
+                    <li>
+                        <xsl:value-of select="."/>
+                    </li>
+                </xsl:for-each>
+            </ul>
+        </xsl:if>
 
-   <xsl:if test="/reference/a2">
-    <ul>
-   <h3>Secondary Authors</h3>
-   <xsl:for-each select="/reference/a2">
-    <li><xsl:value-of select="."/></li>
-   </xsl:for-each>
-  </ul>
-   </xsl:if>
-  <xsl:if test="/reference/k1">
-   <h2>Keywords</h2>
-   <ul>
-    <xsl:for-each select="/reference/k1">
-     <li><xsl:value-of select="."/></li>
-    </xsl:for-each>
-   </ul>
-  </xsl:if>
-  <xsl:if test="/reference/ab">
-  <h2>Abstract</h2>
-   <xsl:for-each select="/reference/ab">
-    <div><xsl:value-of select="."/> </div>
-   </xsl:for-each>
-  </xsl:if>
-  <xsl:if test="/reference/no">
-  <h2>Notes</h2>
-  <xsl:for-each select="/reference/no">
-   <div><xsl:value-of select="."/> </div>
-  </xsl:for-each>
-  </xsl:if>
-  <xsl:variable name="ISSN">
-  <xsl:value-of select="/reference/sn"/>
- </xsl:variable>
-  <xsl:variable name="BASEURL">
-    http://articles.library.upei.ca:7888/godot/hold_tab.cgi?hold_tab_branch=PCU&amp;issn=<xsl:value-of select="/reference/sn/text()"/>&amp;date=<xsl:value-of select="/reference/yr/text()"/>&amp;volume=<xsl:value-of select="/reference/vo/text()"/>&amp;issue=<xsl:value-of select="/reference/is/text()"/>&amp;spage=<xsl:value-of select="/reference/sp/text()"/>&amp;atitle=<xsl:value-of select="/reference/t1"/>&amp;stitle=<xsl:value-of select="/reference/jf"/>
- </xsl:variable>
- <br />
- <xsl:if test="/reference/sn">
- <div><a>
- <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/></xsl:attribute>
- <xsl:attribute name="target">_blank</xsl:attribute>
- <img src="http://asin1.its.unb.ca:8000/muse/images/getit4.gif"/> </a></div>
- </xsl:if>
- </xsl:template>
+        <xsl:if test="/reference/a2">
+            <ul>
+                <h3>Secondary Authors</h3>
+                <xsl:for-each select="/reference/a2">
+                    <li>
+                        <xsl:value-of select="."/>
+                    </li>
+                </xsl:for-each>
+            </ul>
+        </xsl:if>
+        <xsl:if test="/reference/k1">
+            <h2>Keywords</h2>
+            <ul>
+                <xsl:for-each select="/reference/k1">
+                    <li>
+                        <xsl:value-of select="."/>
+                    </li>
+                </xsl:for-each>
+            </ul>
+        </xsl:if>
+        <xsl:if test="/reference/ab">
+            <h2>Abstract</h2>
+            <xsl:for-each select="/reference/ab">
+                <div>
+                    <xsl:value-of select="."/>
+                </div>
+            </xsl:for-each>
+        </xsl:if>
+        <xsl:if test="/reference/no">
+            <h2>Notes</h2>
+            <xsl:for-each select="/reference/no">
+                <div>
+                    <xsl:value-of select="."/>
+                </div>
+            </xsl:for-each>
+        </xsl:if>
+        <xsl:variable name="ISSN">
+            <xsl:value-of select="/reference/sn"/>
+        </xsl:variable>
+        <xsl:variable name="BASEURL">
+    http://articles.library.upei.ca:7888/godot/hold_tab.cgi?hold_tab_branch=PCU&amp;issn=
+            <xsl:value-of select="/reference/sn/text()"/>&amp;date=
+            <xsl:value-of select="/reference/yr/text()"/>&amp;volume=
+            <xsl:value-of select="/reference/vo/text()"/>&amp;issue=
+            <xsl:value-of select="/reference/is/text()"/>&amp;spage=
+            <xsl:value-of select="/reference/sp/text()"/>&amp;atitle=
+            <xsl:value-of select="/reference/t1"/>&amp;stitle=
+            <xsl:value-of select="/reference/jf"/>
+        </xsl:variable>
+        <br />
+        <xsl:if test="/reference/sn">
+            <div>
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="$BASEURL"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="target">_blank</xsl:attribute>
+                    <img src="http://asin1.its.unb.ca:8000/muse/images/getit4.gif"/>
+                </a>
+            </div>
+        </xsl:if>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/riri-sparqltoHtml.xsl

@@ -1,65 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- Red and White XSLT -->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name="cellsPerRow" select="4"/>
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">
-<table cellpadding="3" cellspacing="3" width="90%">
- <tr><td colspan="{$cellsPerRow}">
-  <div STYLE="text-align: center;">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name="cellsPerRow" select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
+            <table cellpadding="3" cellspacing="3" width="90%">
+                <tr>
+                    <td colspan="{$cellsPerRow}">
+                        <div STYLE="text-align: center;">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when>
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  <br clear="all" />
- </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                        <br clear="all" />
+                    </td>
+                </tr>
 
   <!--<xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
   <xsl:variable name='OBJECTURI' select="object/@uri"/>
@@ -79,139 +110,182 @@
    </tr>
   </xsl:for-each>-
  -->
- <xsl:apply-templates select="sparql/results"/>
-</table><br clear="all" />
-<div STYLE="text-align: center;">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                <xsl:apply-templates select="sparql/results"/>
+            </table>
+            <br clear="all" />
+            <div STYLE="text-align: center;">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when>
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/>
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
- <xsl:template match="sparql/results">
-   <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
-    <tr>
-     <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
-    </tr>
-   </xsl:for-each>
- </xsl:template>
- <xsl:template match="result">
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <xsl:variable name="newTitle" >
-  <xsl:call-template name="replace-string">
-   <xsl:with-param name="text" select="title"/>
-   <xsl:with-param name="from" select="'_'"/>
-   <xsl:with-param name="to" select="' '"/>
-  </xsl:call-template>
-   </xsl:variable>
-  <xsl:variable name="linkUrl">
-   <xsl:choose>
-    <xsl:when test="(content='Collection' or content='Community')">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="title"/>.pdf <!-- we know in riri that all OBJ streams are pdf so we can add the extension to tell browsers what it is-->
-     </xsl:otherwise>
-   </xsl:choose>
-  </xsl:variable>
-  <td valign="top" width="25%">
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
-    </xsl:attribute>
-   <img>
-    <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-    </xsl:attribute>
-	<xsl:attribute name="alt"><xsl:value-of select="$newTitle"/>
-    </xsl:attribute>
-   </img> </a>  <br clear="all" />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$linkUrl"/>
-    </xsl:attribute>
-    <xsl:value-of select="$newTitle"/>
-   </a>
-   <xsl:if test="(content!='Collection' and content!='Community')">
-       <br />--<a>
-     <xsl:attribute name="href">
-     <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="sparql/results">
+        <xsl:for-each select="result[position() mod $cellsPerRow = 1 and position()>=$start and position() &lt;=$end]">
+            <tr>
+                <xsl:apply-templates select=". | following-sibling::result[position() &lt; $cellsPerRow]"/>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+    <xsl:template match="result">
+        <xsl:variable name='OBJECTURI' select="object/@uri"/>
+        <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+        <xsl:variable name="newTitle" >
+            <xsl:call-template name="replace-string">
+                <xsl:with-param name="text" select="title"/>
+                <xsl:with-param name="from" select="'_'"/>
+                <xsl:with-param name="to" select="' '"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="linkUrl">
+            <xsl:choose>
+                <xsl:when test="(content='Collection' or content='Community')">
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/-/
+                    <xsl:value-of select="title"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                    <xsl:copy-of select="$PID"/>/OBJ/
+                    <xsl:value-of select="title"/>.pdf <!-- we know in riri that all OBJ streams are pdf so we can add the extension to tell browsers what it is-->
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <td valign="top" width="25%">
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$linkUrl"/>
+                </xsl:attribute>
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:value-of select="$PID"/>/TN
+                    </xsl:attribute>
+                    <xsl:attribute name="alt">
+                        <xsl:value-of select="$newTitle"/>
+                    </xsl:attribute>
+                </img>
+            </a>
+            <br clear="all" />
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:value-of select="$linkUrl"/>
+                </xsl:attribute>
+                <xsl:value-of select="$newTitle"/>
+            </a>
+            <xsl:if test="(content!='Collection' and content!='Community')">
+                <br />--
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                        <xsl:copy-of select="$PID"/>/-/
+                        <xsl:value-of select="title"/>
+                    </xsl:attribute>
     DETAILS
-    </a>--
-   </xsl:if>
-   </td>
-  <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="FillerCells">
-  <xsl:param name="cellCount"/>
-  <td>&#160;</td>
-  <xsl:if test="$cellCount > 1">
-   <xsl:call-template name="FillerCells">
-    <xsl:with-param name="cellCount" select="$cellCount - 1"/>
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
- <xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="from"/>
-  <xsl:param name="to"/>
+                </a>--
+            </xsl:if>
+        </td>
+        <xsl:if test="(position() = last()) and (position() &lt; $cellsPerRow)">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellsPerRow - position()"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="FillerCells">
+        <xsl:param name="cellCount"/>
+        <td>&#160;</td>
+        <xsl:if test="$cellCount > 1">
+            <xsl:call-template name="FillerCells">
+                <xsl:with-param name="cellCount" select="$cellCount - 1"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template name="replace-string">
+        <xsl:param name="text"/>
+        <xsl:param name="from"/>
+        <xsl:param name="to"/>
 
-  <xsl:choose>
-   <xsl:when test="contains($text, $from)">
+        <xsl:choose>
+            <xsl:when test="contains($text, $from)">
 
-    <xsl:variable name="before" select="substring-before($text, $from)"/>
-    <xsl:variable name="after" select="substring-after($text, $from)"/>
-    <xsl:variable name="prefix" select="concat($before, $to)"/>
+                <xsl:variable name="before" select="substring-before($text, $from)"/>
+                <xsl:variable name="after" select="substring-after($text, $from)"/>
+                <xsl:variable name="prefix" select="concat($before, $to)"/>
 
-    <xsl:value-of select="$before"/>
-    <xsl:value-of select="$to"/>
-    <xsl:call-template name="replace-string">
-     <xsl:with-param name="text" select="$after"/>
-     <xsl:with-param name="from" select="$from"/>
-     <xsl:with-param name="to" select="$to"/>
-    </xsl:call-template>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$text"/>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
+                <xsl:value-of select="$before"/>
+                <xsl:value-of select="$to"/>
+                <xsl:call-template name="replace-string">
+                    <xsl:with-param name="text" select="$after"/>
+                    <xsl:with-param name="from" select="$from"/>
+                    <xsl:with-param name="to" select="$to"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>

example_collection_views/sparqltoHtml.xsl

@@ -1,125 +1,190 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <!-- DEFAULT XSLT FOR COLLECTIONS THAT DO NOT DEFINE THEIR OWN-->
- <xsl:variable name="BASEURL">
-  <xsl:value-of select="$baseUrl"/>
- </xsl:variable>
- <xsl:variable name="PATH">
-  <xsl:value-of select="$path"/>
- </xsl:variable>
- <xsl:variable name="thisPid" select="$collectionPid"/>
- <xsl:variable name="thisTitle" select="$collectionTitle"/>
- <xsl:variable name="size"  select="20"/>
- <xsl:variable name="page" select="$hitPage"/>
- <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
- <xsl:variable name="end" select="($start - 1) + number($size)"/>
-  <xsl:variable name='columns' select="4"/>
- <xsl:variable name="count" select="count(sparql/results/result)"/>
-<xsl:template match="/">
- <xsl:if test="$count>0">
+    <xsl:variable name="BASEURL">
+        <xsl:value-of select="$baseUrl"/>
+    </xsl:variable>
+    <xsl:variable name="PATH">
+        <xsl:value-of select="$path"/>
+    </xsl:variable>
+    <xsl:variable name="thisPid" select="$collectionPid"/>
+    <xsl:variable name="thisTitle" select="$collectionTitle"/>
+    <xsl:variable name="size"  select="20"/>
+    <xsl:variable name="page" select="$hitPage"/>
+    <xsl:variable name="start" select="((number($page) - 1) * number($size)) + 1"/>
+    <xsl:variable name="end" select="($start - 1) + number($size)"/>
+    <xsl:variable name='columns' select="4"/>
+    <xsl:variable name="count" select="count(sparql/results/result)"/>
+    <xsl:template match="/">
+        <xsl:if test="$count>0">
   
-<table width='100%'>
- <tr><td colspan="2">
-  <div align="center">
-   <xsl:choose>
-    <xsl:when test="$end >= $count and $start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-    </xsl:when>
-    <xsl:when test="$end >= $count">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+            <table width='100%'>
+                <tr>
+                    <td colspan="2">
+                        <div align="center">
+                            <xsl:choose>
+                                <xsl:when test="$end >= $count and $start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                </xsl:when>
+                                <xsl:when test="$end >= $count">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$count"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>
-    </xsl:when> 
-    <xsl:when test="$start = 1">
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>        
+                                    </a>
+                                </xsl:when>
+                                <xsl:when test="$start = 1">
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-     of <xsl:value-of select="$count"/>&#160;<br />
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-      </xsl:attribute>    
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="$start"/>-
+                                    <xsl:value-of select="$end"/>
+     of 
+                                    <xsl:value-of select="$count"/>&#160;
+                                    <br />
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page - 1"/>
+                                        </xsl:attribute>
       &lt;&lt;Prev
-     </a>&#160;
-     <a>
-      <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-      </xsl:attribute>    
+                                    </a>&#160;
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                            <xsl:value-of select="$thisPid"/>/-/
+                                            <xsl:value-of select="$thisTitle"/>/
+                                            <xsl:value-of select="$page + 1"/>
+                                        </xsl:attribute>
       Next>>
-     </a>
-    </xsl:otherwise>
-   </xsl:choose>
-  </div>  
- </td></tr>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </div>
+                    </td>
+                </tr>
  <!--select="//guestbook/entry[position()>=$start and $end>=position()]">-->
- <xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">  
-  <xsl:variable name='OBJECTURI' select="object/@uri"/>
-  <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
-  <tr>
-   <td>    
-    <img>
-     <xsl:attribute name="src"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$PID"/>/TN
-     </xsl:attribute>
-    </img>
-   </td><td>
-    <a>
-     <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/-/<xsl:value-of select="title"/>
-     </xsl:attribute>
-    <xsl:value-of select="title"/>
-   </a>
-   </td></tr>
- </xsl:for-each>
-</table>
-<div align="center">
- <xsl:choose>
-  <xsl:when test="$end >= $count and $start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-  </xsl:when>
-  <xsl:when test="$end >= $count">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$count"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                <xsl:for-each select="/sparql/results/result[position()>=$start and position() &lt;=$end]">
+                    <xsl:variable name='OBJECTURI' select="object/@uri"/>
+                    <xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
+                    <tr>
+                        <td>
+                            <img>
+                                <xsl:attribute name="src">
+                                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                    <xsl:value-of select="$PID"/>/TN
+                                </xsl:attribute>
+                            </img>
+                        </td>
+                        <td>
+                            <a>
+                                <xsl:attribute name="href">
+                                    <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                    <xsl:copy-of select="$PID"/>/-/
+                                    <xsl:value-of select="title"/>
+                                </xsl:attribute>
+                                <xsl:value-of select="title"/>
+                            </a>
+                        </td>
+                    </tr>
+                </xsl:for-each>
+            </table>
+            <div align="center">
+                <xsl:choose>
+                    <xsl:when test="$end >= $count and $start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                    </xsl:when>
+                    <xsl:when test="$end >= $count">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$count"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>
-  </xsl:when> 
-  <xsl:when test="$start = 1">
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>        
+                        </a>
+                    </xsl:when>
+                    <xsl:when test="$start = 1">
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:when>
-  <xsl:otherwise>
-   <xsl:value-of select="$start"/>-<xsl:value-of select="$end"/> 
-   of <xsl:value-of select="$count"/>&#160;<br />
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page - 1"/>
-    </xsl:attribute>    
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$start"/>-
+                        <xsl:value-of select="$end"/>
+   of 
+                        <xsl:value-of select="$count"/>&#160;
+                        <br />
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page - 1"/>
+                            </xsl:attribute>
     &lt;&lt;Prev
-   </a>&#160;
-   <a>
-    <xsl:attribute name="href"><xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:value-of select="$thisPid"/>/-/<xsl:value-of select="$thisTitle"/>/<xsl:value-of select="$page + 1"/>
-    </xsl:attribute>    
+                        </a>&#160;
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="$BASEURL"/>/fedora/repository/
+                                <xsl:value-of select="$thisPid"/>/-/
+                                <xsl:value-of select="$thisTitle"/>/
+                                <xsl:value-of select="$page + 1"/>
+                            </xsl:attribute>
     Next>>
-   </a>
-  </xsl:otherwise>
- </xsl:choose>
- </div>
- </xsl:if>
-</xsl:template>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </div>
+        </xsl:if>
+    </xsl:template>
 </xsl:stylesheet>

fedora_repository.install

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /**
  * @file fedora_repository.install
@@ -59,7 +60,7 @@ function fedora_repository_requirements($phase) {
       $requirements['fedora-repository']['value'] = t("Not available");
       $requirements['fedora-repository']['severity'] = REQUIREMENT_ERROR;
       $requirements['fedora-repository']['description'] = t('Ensure that Fedora is running and that the <a href="@collection-settings">collection settings</a> are correct.',
-              array('@collection-settings' => $base_url.'/admin/settings/fedora_repository'));
+          array('@collection-settings' => $base_url . '/admin/settings/fedora_repository'));
     }
     else {
       $requirements['fedora-repository']['value'] = t("Available");

fedora_repository.module

@@ -53,9 +53,10 @@ function fedora_repository_purge_object($pid = NULL, $name = NULL) {
     drupal_set_message(t('You must specify an object pid to purge an object.'), 'error');
     return '';
   }
-  $output = t('Are you sure you wish to purge object %name %pid!<br /><b>This cannot be undone</b><br />', array(
-    '%name' => $name,
-    '%pid' => $pid)
+  $output = t('Are you sure you wish to purge object %name %pid!<br /><b>This cannot be undone</b><br />',
+      array(
+        '%name' => $name,
+        '%pid' => $pid)
   );
 
   $output .= drupal_get_form('fedora_repository_purge_object_form', $pid);
@@ -93,8 +94,8 @@ function fedora_repository_ingest_object($collection_pid=NULL, $collection_label
     return '';
   }
 
-  if (!validPid($collection_pid)) {
-    if (validPid(urldecode($collection_pid))) {
+  if (!valid_pid($collection_pid)) {
+    if (valid_pid(urldecode($collection_pid))) {
       $collection_pid = urldecode($collection_pid);
     }
     else {
@@ -210,7 +211,7 @@ 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;
               }
@@ -286,7 +287,7 @@ function fedora_repository_purge_object_form(&$form_state, $pid, $referrer = NUL
 
 function add_stream($collection_pid=NULL, $collectionName=NULL) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
-  if (!validPid($collection_pid)) {
+  if (!valid_pid($collection_pid)) {
     drupal_set_message(t("This PID is not valid!"), 'error');
     return ' ';
   }
@@ -377,9 +378,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);
@@ -403,8 +404,9 @@ function fedora_repository_purge_stream($pid = NULL, $dsId = NULL, $name = NULL)
     return ' ';
   }
 
-  $output = t('Are you sure you wish to purge this datastream %name<br />', array(
-    '%name' => $name)
+  $output = t('Are you sure you wish to purge this datastream %name<br />',
+      array(
+        '%name' => $name)
   );
   $output .= drupal_get_form('fedora_repository_purge_stream_form', $pid, $dsId);
   return $output;
@@ -534,7 +536,7 @@ function fedora_repository_replace_stream_form_submit($form, &$form_state) {
   $pid = $form_state['values']['pid'];
   $dsid = $form_state['values']['dsId'];
   $dsLabel = $form_state['values']['dsLabel'];
-// Remove the original file extension from the label and add the new one
+  // Remove the original file extension from the label and add the new one
   $indexOfDot = strrpos($dsLabel, '.'); //use strrpos to get the last dot
   if ($indexOfDot !== FALSE) {
     $dsLabel = substr($dsLabel, 0, $indexOfDot);
@@ -706,12 +708,12 @@ function fedora_repository_access($op, $node, $account) {
  */
 function makeObject($pid, $dsID) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
-  if (!validPid($pid)) {
+  if (!valid_pid($pid)) {
     drupal_set_message(t("Invalid PID!"), 'error');
     return ' ';
   }
 
-  if (!validDsid($dsID)) {
+  if (!valid_dsid($dsID)) {
     drupal_set_message(t("Invalid dsID!"), 'error');
     return ' ';
   }
@@ -742,27 +744,29 @@ function makeObject($pid, $dsID) {
 function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NULL, $page_number = NULL, $limit = NULL) {
   module_load_include('inc', 'fedora_repository', 'ObjectHelper');
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
+  module_load_include('inc', 'fedora_repository', 'api/fedora_item');
   global $user;
 
-
   if (!fedora_available()) {
-    drupal_set_message('The Fedora repository server is currently unavailable. Please contact the site administrator.', 'warning', FALSE);
+    drupal_set_message(t('The Fedora repository server is currently unavailable. Please contact the site administrator.'), 'warning', FALSE);
     return '';
   }
 
-  if ($pid & !validPid($pid)) {
+  $item = new fedora_item($pid);
+  if (!$item->exists()) {
+    drupal_not_found();
+  }
 
+  if ($pid & !validPid($pid)) {
     drupal_set_message(t("Invalid PID!"), 'error');
     return ' ';
   }
 
-  if ($dsId & !validDsid($dsId)) {
+  if ($dsId & !valid_dsid($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');
-
     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');
     }
@@ -790,13 +794,6 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
 
   module_load_include('inc', 'fedora_repository', 'CollectionClass');
   $collectionClass = new CollectionClass();
-//if(!isset($pageNumber)){
-//    $pageNumber=0;
-//}
-//if(!isset($limit)){
-//    $limit=20;
-//}
-
   module_load_include('inc', 'fedora_repository', 'ContentModel');
   module_load_include('inc', 'fedora_repository', 'plugins/fedoraObject');
   $breadcrumbs = array();
@@ -804,15 +801,12 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   drupal_set_breadcrumb(array_reverse($breadcrumbs));
 
   $offset = $limit * $page_number;
-//$results = $collectionClass->getRelatedObjects($pid, $limit, $offset, NULL); //updated so we can do paging in query not in xslt
-//$results = $collectionClass->getRelatedItems($pid, NULL);
   $content_models = $objectHelper->get_content_models_list($pid);
 // Each content model may return either a tabset array or plain HTML. If it's HTML, stick it in a tab.
   $cmodels_tabs = array(
     '#type' => 'tabset',
   );
   foreach ($content_models as $content_model) {
-//$content_model_fieldsets = $objectHelper->createExtraFieldsets($pid, $content_model, $pageNumber);
     $content_model_fieldset = $content_model->displayExtraFieldset($pid, $page_number);
     if (is_array($content_model_fieldset)) {
       $cmodels_tabs = array_merge($cmodels_tabs, $content_model_fieldset);
@@ -829,13 +823,6 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   $obj = new FedoraObject($pid);
   $object_details = $obj->showFieldSets();
   $cmodels_tabs = array_merge($cmodels_tabs, $object_details);
-
-
-//$content .= $objectHelper
-//$content .= $objectHelper->parseContent($results, $pid, $dsId, $collection, $pageNumber);
-//the below is for islandlives we should be able to do this in the xslt though
-//$css=$path.'/stylesheets/container-large.css';
-//drupal_add_css($css);
   return tabs_render($cmodels_tabs);
 }
 
@@ -892,7 +879,7 @@ function repository_service($pid = NULL, $servicePid = NULL, $serviceMethod = NU
 
 
   $item = new Fedora_Item($pid);
-  if ($item !== false) {
+  if ($item !== FALSE) {
     echo $item->get_dissemination($servicePid, $serviceMethod);
   }
 
@@ -1285,10 +1272,10 @@ function fedora_repository_demo_objects_form() {
   );
 
   foreach (array(
-'islandora:collectionCModel' => 'Islandora default content models',
- 'islandora:top' => 'Islandora top-level collection',
- 'islandora:demos' => 'Islandora demos collection',
- 'islandora:largeimages' => 'Sample large image content model (requires <a href="http://sourceforge.net/projects/djatoka/">Djatoka</a> and <a href="http://www.kakadusoftware.com/index.php?option=com_content&task=view&id=26&Itemid=22">Kakadu</a>.)',
+  'islandora:collectionCModel' => 'Islandora default content models',
+  'islandora:top' => 'Islandora top-level collection',
+  'islandora:demos' => 'Islandora demos collection',
+  'islandora:largeimages' => 'Sample large image content model (requires <a href="http://sourceforge.net/projects/djatoka/">Djatoka</a> and <a href="http://www.kakadusoftware.com/index.php?option=com_content&task=view&id=26&Itemid=22">Kakadu</a>.)',
   )
   as $available_demo => $available_demo_desc) {
     try {
@@ -1391,7 +1378,7 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
         $cmodel_collection->add_relationship('hasModel', 'islandora:collectionCModel', FEDORA_MODEL_URI);
         $cmodel_collection->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/collection_views/simple_list_view.xml', 'COLLECTION_VIEW', 'Collection View', 'text/xml', 'X');
         $cmodel_collection->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/images/contentModel.jpg', 'TN', 'Thumbnail', 'image/jpg', 'M');
-        drupal_set_message("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:ContentModelCollection\">islandora:ContentModelCollection</a>.", 'message');
+        drupal_set_message(t("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:ContentModelCollection\">islandora:ContentModelCollection</a>."), 'message');
       } catch (exception $e) {
         
       }
@@ -1403,7 +1390,7 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
       $cp = $new_item->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/collection_policies/COLLECTION-COLLECTION POLICY.xml', 'COLLECTION_POLICY', 'Collection Policy', 'text/xml', 'X');
       try {
         $tn = $new_item->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/images/Gnome-emblem-photos.png', 'TN', 'Thumbnail.png', 'image/png', 'M');
-        drupal_set_message("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:top\">islandora:top</a>.", 'message');
+        drupal_set_message(t("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:top\">islandora:top</a>."), 'message');
       } catch (exception $e) {
         
       }
@@ -1423,7 +1410,7 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
         $new_item->add_relationship('hasModel', 'islandora:collectionCModel', FEDORA_MODEL_URI);
         $cp = $new_item->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/collection_policies/PDF-COLLECTION POLICY.xml', 'COLLECTION_POLICY', 'Collection Policy', 'text/xml', 'X');
         $tn = $new_item->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/images/Crystal_Clear_mimetype_pdf.png', 'TN', 'Thumbnail.png', 'image/png', 'M');
-        drupal_set_message("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:demos\">islandora:demos</a>.", 'message');
+        drupal_set_message(t("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:demos\">islandora:demos</a>."), 'message');
       } catch (exception $e) {
         
       }
@@ -1445,7 +1432,7 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
       $dual_res_image_collection_cmodel = new Fedora_Item('demo:DualResImageCollection');
       try {
         $cmstream = $dual_res_image_collection_cmodel->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/content_models/COLLECTIONCM.xml', 'ISLANDORACM', 'Islandora Content Model.xml', 'application/xml', 'X');
-        drupal_set_message("Successfully installed <a href=\"" . $base_url . "/fedora/repository/demo:SmileyStuff\">demo:SmileyStuff</a> collection view.", 'message');
+        drupal_set_message(t("Successfully installed <a href=\"" . $base_url . "/fedora/repository/demo:SmileyStuff\">demo:SmileyStuff</a> collection view."), 'message');
       } catch (exception $e) {
         
       }
@@ -1454,7 +1441,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) {
@@ -1464,14 +1451,14 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
       try {
         $item = Fedora_Item::ingest_from_FOXML_file(drupal_get_path('module', 'fedora_repository') . '/content_models/islandora_largeimages.xml');
         $tn = $item->add_datastream_from_file(drupal_get_path('module', 'fedora_repository') . '/images/Gnome-emblem-photos.png', 'TN', 'Thumbnail.png', 'image/png', 'M');
-        drupal_set_message("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:largeimages\">islandora:largeimages</a>.", 'message');
+        drupal_set_message(t("Successfully installed <a href=\"" . $base_url . "/fedora/repository/islandora:largeimages\">islandora:largeimages</a>."), 'message');
       } catch (exception $e) {
         $error .= " - Problem ingesting islandora:largeimages collection";
       }
     }
 
     if (!empty($error)) {
-      drupal_set_message('Some problems occurred: ' . $error);
+      drupal_set_message(t('Some problems occurred: ' . $error));
     }
   }
 }
@@ -1919,7 +1906,7 @@ function _fedora_repository_empty_basket() {
 
 function fedora_repository_add_to_basket($pid, $warn = TRUE, $searchResultsFlag = FALSE) {
   if ($warn && _is_added_to_basket($pid)) {
-    drupal_set_message("Object already in basket");
+    drupal_set_message(t("Object already in basket"));
   }
 
   if (!isset($_SESSION['basket'])) {
@@ -1960,7 +1947,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)
     );
   }
 
@@ -1988,7 +1977,7 @@ function fedora_repository_batch_reingest_object($object, &$context) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
   if (!empty($object) && is_array($object)) {
     $pid = $object['pid'];
-    if (!validPid($pid)) {
+    if (!valid_pid($pid)) {
       return NULL;
     }
 // Does the object exist? If so, purge it.

fedora_repository.solutionpacks.inc

@@ -1,7 +1,7 @@
 <?php
 
-
 /**
+ * @file
  * Invokes a hook to any dependent modules asking them if their installations require
  * any fedora objects to be present. Modules implementing this hook should return an array
  * of arrays of the form:
@@ -87,7 +87,8 @@ function fedora_repository_solution_pack_form(&$form_state, $solution_pack_modul
         if (!$item->exists()) {
           $object_status = 'Missing';
           $needs_install = TRUE;
-        } else {
+        }
+        else {
           if (isset($object['dsid']) && isset($object['datastream_file']) && isset($object['dsversion'])) {
             $datastreams = array(
               array(
@@ -96,7 +97,8 @@ function fedora_repository_solution_pack_form(&$form_state, $solution_pack_modul
                 'dsversion' => $object['dsversion'],
               ),
             );
-          } elseif (!empty($object['datastreams'])) {
+          }
+          elseif (!empty($object['datastreams'])) {
             $datastreams = $object['datastreams'];
           }
           if (!empty($datastreams) && is_array($datastreams)) {
@@ -118,7 +120,7 @@ function fedora_repository_solution_pack_form(&$form_state, $solution_pack_modul
                 }
               }
             }
-          }  
+          }
         }
         array_push($table_row, $object_status);
         $table_rows[] = $table_row;
@@ -137,7 +139,8 @@ function fedora_repository_solution_pack_form(&$form_state, $solution_pack_modul
   );
   if (!$needs_install && !$needs_update) {
     $form['install_status']['#value'] = theme_image('misc/watchdog-ok.png') . t('All required objects are installed and up-to-date.');
-  } else {
+  }
+  else {
     $form['install_status']['#value'] = theme_image('misc/watchdog-warning.png') . t('Some objects must be re-ingested. See Objects list for details.');
   }
   $form['submit'] = array(

ilives/book.inc

@@ -1,6 +1,9 @@
 <?php
 
-// $Id$
+/**
+ * @file 
+ * 
+ */
 
 class IslandoraBook {
 
@@ -100,7 +103,7 @@ class IslandoraBook {
     $dwc->handleForm($form_values);
     $this->item->purge_datastream('DARWIN_CORE');
     $this->item->add_datastream_from_string($dwc->darwinCoreXML, 'DARWIN_CORE',
-        'Darwin Core Metadata', 'text/xml', 'X');
+      'Darwin Core Metadata', 'text/xml', 'X');
     return TRUE;
   }
 
@@ -134,10 +137,10 @@ class IslandoraBook {
     $mimetype = new MimeClass();
 
     $new_item = Fedora_Item::ingest_new_item(!empty($form_values['custom_pid']) ? $form_values['custom_pid'] : $form_values['pid'], 'A', $title,
-            $user->name);
+        $user->name);
 
     $new_item->add_datastream_from_string($mods_text, 'MODS',
-        'MODS Metadata', 'text/xml', 'X');
+      'MODS Metadata', 'text/xml', 'X');
 
     $dc = transform_mods_to_dc($mods_text);
     if ($dc) {
@@ -193,7 +196,7 @@ class IslandoraBook {
         '#content' => $html
       );
     }
-   
+
     if (!$hasPage && user_access('ingest new fedora objects')) {
       $tabset['third_tab'] = array(
         '#type' => 'tabpage',

ilives/fedora_ilives.install

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * @file fedora_ilives.install
@@ -9,5 +10,5 @@
  * Implementation of hook_enable()
  */
 function fedora_ilives_enable() {
- 
+
 }

ilives/fedora_ilives.module

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 /*
  * To change this template, choose Tools | Templates
@@ -529,7 +529,7 @@ function fedora_ilives_requirements($phase) {
       $requirements['iiv-war']['value'] = ("Not available");
       $requirements['iiv-war']['severity'] = REQUIREMENT_ERROR;
       $requirements['iiv-war']['description'] = t('Ensure that Fedora is running and that the <a href="@iiv-home">IIV</a> app is deployed.',
-              array('@iiv-home' => 'http://github.com/islandora/iiv'));
+          array('@iiv-home' => 'http://github.com/islandora/iiv'));
     }
     else {
       $requirements['iiv-war']['value'] = ("Available");

ilives/image_rotator_tagger_block.inc

@@ -1,7 +1,8 @@
 <?php
-// $Id$
 
-/* 
+
+
+/**
  * @file image_rotator_tagger_block.inc
  */
 
@@ -17,35 +18,33 @@ and $object <dc:title> $title';
   $results = $collection->getRelatedItems('ilives:figures', $itqlquery);
   //drupal_set_message($results);
 
-  
+
   if (empty($results)) {
     return NULL;
   }
   $resultsdoc = new DomDocument();
   $resultsdoc->loadXML($results);
-  
+
   $resultslist = $resultsdoc->getElementsByTagName('result');
-  if ( $resultslist->length == 0 ) {
+  if ($resultslist->length == 0) {
     return NULL;
   }
   //return htmlentities(substr($results, 0, 1000));
-  $randresult = $resultslist->item( rand()%$resultslist->length );
+  $randresult = $resultslist->item(rand() % $resultslist->length);
   if (empty($randresult)) {
     return NULL;
   }
   $objs = $randresult->getElementsByTagName('object');
   $obj = $objs->item(0);
-  $pid = substr( $obj->getAttribute('uri'), 12);
+  $pid = substr($obj->getAttribute('uri'), 12);
   $titles = $randresult->getElementsByTagName('title');
   $title = $titles->item(0);
 
   return array('pid' => $pid,
-               //'title' => $randresult->textContent);
-               'title' => $title->nodeValue);
-
+    //'title' => $randresult->textContent);
+    'title' => $title->nodeValue);
 }
 
-
 function _fedora_image_rotator_tagger_block_content() {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
   module_load_include('inc', 'fedora_repository', 'plugins/tagging_form');
@@ -64,36 +63,39 @@ function _fedora_image_rotator_tagger_block_content() {
   }
   else {
     $result = get_random_image();
-    
+
     $image_item = new Fedora_Item($result['pid']);
   }
-  if (!empty ($result)) {
+  if (!empty($result)) {
+    
+    $image = theme_image( . $base_url . '/fedora/imageapi/' . $result['pid'] . '/JPG?op=scale&height=500&width=300');
+    
     return '<p>'
-     . l( '<img src="'. $base_url . '/fedora/imageapi/'. $result['pid'] .  '/JPG?op=scale&height=500&width=300" />', 'fedora/repository/'. $result['pid'], array('html' => TRUE, 'alias' => TRUE))
-     .'<p>This image is from '. l($result['title'], 'fedora/ilives_book_viewer/'. substr($image_item->pid, 0, strrpos($image_item->pid, '-')), array('html' => TRUE, 'alias' => TRUE)) . '.'
-     . drupal_get_form('fedora_repository_image_tagging_form', $result['pid']) . '</p>';
-  } 
+    . l('<img src="' . $base_url . '/fedora/imageapi/' . $result['pid'] . '/JPG?op=scale&height=500&width=300" />', 'fedora/repository/' . $result['pid'], array('html' => TRUE, 'alias' => TRUE))
+    //. l(t("!image", array(image => $image))
+    . '<p>This image is from ' . l($result['title'], 'fedora/ilives_book_viewer/' . substr($image_item->pid, 0, strrpos($image_item->pid, '-')), array('html' => TRUE, 'alias' => TRUE)) . '.'
+    . drupal_get_form('fedora_repository_image_tagging_form', $result['pid']) . '</p>';
+  }
   else {
     return '';
   }
 }
 
-
 /*
-function fedora_ilives_preprocess_page(&$variables) {
+  function fedora_ilives_preprocess_page(&$variables) {
   drupal_add_js(drupal_get_path('module', 'fedora_ilives').'/fedora_ilives_ajax.js', 'theme');
   return TRUE;
-}*/
+  } */
 
 class ShowILivesStreamsInFieldSets {
 
-  private $pid =NULL;
+  private $pid = NULL;
 
   function ShowILivesStreamsInFieldSets($pid) {
     //drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-    $this->pid=$pid;
+    $this->pid = $pid;
   }
-  
+
   function showJPG() {
     module_load_include('inc', 'fedora_repository', 'plugins/tagging_form');
     global $base_url;
@@ -102,6 +104,7 @@ class ShowILivesStreamsInFieldSets {
       '#value' => '<a href="' . $base_url . '/fedora/repository/' . $this->pid . '/JPG/"><img src="' . $base_url . '/fedora/repository/' . $this->pid . '/JPG/JPG.jpg' . '" /></a>',
     );
     return theme('fieldset', $collection_fieldset)
-      . drupal_get_form('fedora_repository_image_tagging_form', $this->pid);
-  } 
+    . drupal_get_form('fedora_repository_image_tagging_form', $this->pid);
+  }
+
 }

ilives/searchTerms.xml

@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='utf-8'?>
- <search_terms>
+<search_terms>
         <!--define what fields we can query as part of the advanced search for this collection-->
-        <default>dc.title</default>
-		<number_of_results>1000</number_of_results>
-		 <term>
-            <field>dc.title</field>
-            <value>Title</value>
-        </term>
-        <term>
-            <field>mods.sor</field>
-            <value>Author</value>
-        </term>
-        <term>
-            <field>mods.subject</field>
-            <value>Subject</value>
-        </term>
+    <default>dc.title</default>
+    <number_of_results>1000</number_of_results>
+    <term>
+        <field>dc.title</field>
+        <value>Title</value>
+    </term>
+    <term>
+        <field>mods.sor</field>
+        <value>Author</value>
+    </term>
+    <term>
+        <field>mods.subject</field>
+        <value>Subject</value>
+    </term>
         <!--<term>
             <field>mods.publisher</field>
             <value>Publisher</value>
         </term>-->
-        <term>
-            <field>tei.fullText</field>
-            <value>Text</value>
-        </term>
-		<term>
-            <field>tei.persName</field>
-            <value>People</value>
-        </term>
+    <term>
+        <field>tei.fullText</field>
+        <value>Text</value>
+    </term>
+    <term>
+        <field>tei.persName</field>
+        <value>People</value>
+    </term>
         <!--<term>
             <field>tei.fullName</field>
             <value>Fullname</value>
@@ -39,14 +39,14 @@
             <field>tei.region</field>
             <value>Region</value>
         </term>-->
-        <term>
-            <field>tei.placeName</field>
-            <value>Places</value>
-        </term>
-        <term>
-            <field>tei.orgName</field>
-            <value>Organization Name</value>
-        </term>
+    <term>
+        <field>tei.placeName</field>
+        <value>Places</value>
+    </term>
+    <term>
+        <field>tei.orgName</field>
+        <value>Organization Name</value>
+    </term>
        <!-- <term>
             <field>tag</field>
             <value>Tags</value>
@@ -55,7 +55,7 @@
             <field>tagUser</field>
             <value>Tag Creator</value>
         </term>-->
-    </search_terms>
+</search_terms>
 
 
 

ilives/tests/fedora_ilives.test

@@ -1,132 +1,133 @@
 <?php
-// $Id$
 
-/*
-* Tests the functions of the Fedora Repository module.
-*/
+
+
+/**
+ * @file
+ * Tests the functions of the Fedora Repository module.
+ */
 
 class FedoraBookTestCase extends DrupalWebTestCase {
 
- public static function getInfo() {
-   return array(
-     'name' => 'Fedora Book',
-     'description' => t('The Fedora repository book content model.'),
-     'group' => t('fedora repository'),
-   );
- }
-
- function setUp() {
-   parent::setUp('fedora_repository', 'fedora_ilives', '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 testBookCModel() {
-   // First add a book collection 
-   
-   $pid_list = array();
-   // Create a collection for ingesting book content model objects.
-
-   $ingest_form = array();
-   $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
-
-   $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
-   
-   $ingest_title = $this->randomName(32);
-   $ingest_form_step_2['dc:title'] = $ingest_title;
-   $ingest_form_step_2['dc:description'] = $this->randomName(256);
-   $ingest_form_step_2['files[ingest-file-location]'] = realpath(drupal_get_path('module', 'fedora_ilives') . '/xml/book_collection_policy.xml');
-   $this->drupalPost(NULL, $ingest_form_step_2, 'Ingest');
-   $this->assertPattern('/Item .* created successfully./', "Verified item created.");
-
-   $pid = $this->getIngestedPid();
-   $this->drupalGet("fedora/repository/$pid");
-   $pid_list[] = $pid;
-
-   // Now add a book into the new collection
-   $this->pass("Create book collection $pid below top-level collection.", 'fedora book');
-   $ingest_book_form = array();
-   $ingest_book_form['models'] = 'ilives:bookCModel/ISLANDORACM';
-   $this->drupalPost("fedora/ingestObject/$pid/", $ingest_book_form, 'Next');
-   $ingest_book_form_step_2 = array();
-   
-   $ingest_book_form_step_2['mods[mods_record]'] = file_get_contents(drupal_get_path('module', 'fedora_ilives') . '/tests/test_files/mods_record.xml');
-   $this->outputScreenContents();
-   $this->drupalPost(NULL, $ingest_book_form_step_2, 'Ingest');
-   $this->outputScreenContents();
-   $book_pid = $this->getIngestedPid();
-   $pid_list[] = $book_pid;
-   if (!empty($book_pid)) {
-     $this->pass("Successfully ingested book object $book_pid.");
-   }
-   $this->cleanUpRepository($pid_list);
-   
- }
- 
- 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');
-     $this->drupalPost(NULL, array(), 'Delete');
-   }
- }
- 
- 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));
- }
+  public static function getInfo() {
+    return array(
+      'name' => 'Fedora Book',
+      'description' => t('The Fedora repository book content model.'),
+      'group' => t('fedora repository'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('fedora_repository', 'fedora_ilives', '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 testBookCModel() {
+    // First add a book collection
+
+    $pid_list = array();
+    // Create a collection for ingesting book content model objects.
+
+    $ingest_form = array();
+    $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
+
+    $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
+
+    $ingest_title = $this->randomName(32);
+    $ingest_form_step_2['dc:title'] = $ingest_title;
+    $ingest_form_step_2['dc:description'] = $this->randomName(256);
+    $ingest_form_step_2['files[ingest-file-location]'] = realpath(drupal_get_path('module', 'fedora_ilives') . '/xml/book_collection_policy.xml');
+    $this->drupalPost(NULL, $ingest_form_step_2, 'Ingest');
+    $this->assertPattern('/Item .* created successfully./', "Verified item created.");
+
+    $pid = $this->getIngestedPid();
+    $this->drupalGet("fedora/repository/$pid");
+    $pid_list[] = $pid;
+
+    // Now add a book into the new collection
+    $this->pass("Create book collection $pid below top-level collection.", 'fedora book');
+    $ingest_book_form = array();
+    $ingest_book_form['models'] = 'ilives:bookCModel/ISLANDORACM';
+    $this->drupalPost("fedora/ingestObject/$pid/", $ingest_book_form, 'Next');
+    $ingest_book_form_step_2 = array();
+
+    $ingest_book_form_step_2['mods[mods_record]'] = file_get_contents(drupal_get_path('module', 'fedora_ilives') . '/tests/test_files/mods_record.xml');
+    $this->outputScreenContents();
+    $this->drupalPost(NULL, $ingest_book_form_step_2, 'Ingest');
+    $this->outputScreenContents();
+    $book_pid = $this->getIngestedPid();
+    $pid_list[] = $book_pid;
+    if (!empty($book_pid)) {
+      $this->pass("Successfully ingested book object $book_pid.");
+    }
+    $this->cleanUpRepository($pid_list);
+  }
+
+  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');
+      $this->drupalPost(NULL, array(), 'Delete');
+    }
+  }
+
+  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(t('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;
- }
-
-} 
+    // 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;
+  }
+
+}
+

ilives/tests/test_files/mods_record.xml

@@ -1,83 +1,83 @@
 <?xml version="1.0"?>
 <mods:modsCollection xmlns:mods="http://www.loc.gov/mods/v3" version="3.0">
-  <mods:mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.0" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-0.xsd">
-    <titleInfo>
-      <nonSort>The </nonSort>
-      <title>amazing Maurice and his educated rodents</title>
-    </titleInfo>
-    <name type="personal">
-      <namePart>Pratchett, Terry.</namePart>
-      <role>
-        <roleTerm authority="marcrelator" type="text">creator</roleTerm>
-      </role>
-    </name>
-    <typeOfResource>text</typeOfResource>
-    <genre authority="marc">novel</genre>
-    <originInfo>
-      <place>
-        <placeTerm type="code" authority="marccountry">enk</placeTerm>
-      </place>
-      <place>
-        <placeTerm type="text">London</placeTerm>
-      </place>
-      <publisher>Corgi Books</publisher>
-      <dateIssued>2002</dateIssued>
-      <dateIssued encoding="marc">2001</dateIssued>
-      <issuance>monographic</issuance>
-    </originInfo>
-    <language>
-      <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
-    </language>
-    <physicalDescription>
-      <form authority="marcform">print</form>
-      <extent>269 p. ; 22 cm.</extent>
-    </physicalDescription>
-    <abstract>A talking cat, intelligent rats, and a strange boy cooperate in a Pied Piper scam until they try to con the wrong town and are confronted by a deadly evil rat king.</abstract>
-    <targetAudience authority="marctarget">juvenile</targetAudience>
-    <note type="statement of responsibility">Terry Pratchett.</note>
-    <note>Carnegie Medal winner.</note>
-    <subject authority="lcsh">
-      <topic>Discworld (Imaginary place)</topic>
-      <topic>Fiction</topic>
-    </subject>
-    <subject authority="lcsh">
-      <topic>Discworld (Imaginary place)</topic>
-      <topic>Fiction</topic>
-    </subject>
-    <subject authority="lcsh">
-      <topic>Rats</topic>
-      <topic>Fiction</topic>
-    </subject>
-    <subject authority="lcsh">
-      <topic>Cats</topic>
-      <topic>Fiction</topic>
-    </subject>
-    <subject authority="lcsh">
-      <topic>Fantasy fiction</topic>
-    </subject>
-    <subject authority="lcsh">
-      <topic>Humorous stories</topic>
-    </subject>
-    <classification authority="lcc">PZ7.P8865 Am 2002</classification>
-    <relatedItem>
-      <titleInfo>
-        <title>Discworld series</title>
-      </titleInfo>
-      <name type="personal">
-        <namePart>Pratchett, Terry.</namePart>
-      </name>
-    </relatedItem>
-    <identifier type="isbn">006001234X (library binding)</identifier>
-    <identifier type="isbn">0385601239</identifier>
-    <identifier type="isbn">0552546933 (pbk.)</identifier>
-    <recordInfo>
-      <recordContentSource authority="marcorg">CaNWHRN</recordContentSource>
-      <recordCreationDate encoding="marc">010730</recordCreationDate>
-      <recordChangeDate encoding="iso8601">20020314      .0</recordChangeDate>
-      <languageOfCataloging>
-        <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
-      </languageOfCataloging>
-    </recordInfo>
-  </mods:mods>
+    <mods:mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.0" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-0.xsd">
+        <titleInfo>
+            <nonSort>The </nonSort>
+            <title>amazing Maurice and his educated rodents</title>
+        </titleInfo>
+        <name type="personal">
+            <namePart>Pratchett, Terry.</namePart>
+            <role>
+                <roleTerm authority="marcrelator" type="text">creator</roleTerm>
+            </role>
+        </name>
+        <typeOfResource>text</typeOfResource>
+        <genre authority="marc">novel</genre>
+        <originInfo>
+            <place>
+                <placeTerm type="code" authority="marccountry">enk</placeTerm>
+            </place>
+            <place>
+                <placeTerm type="text">London</placeTerm>
+            </place>
+            <publisher>Corgi Books</publisher>
+            <dateIssued>2002</dateIssued>
+            <dateIssued encoding="marc">2001</dateIssued>
+            <issuance>monographic</issuance>
+        </originInfo>
+        <language>
+            <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
+        </language>
+        <physicalDescription>
+            <form authority="marcform">print</form>
+            <extent>269 p. ; 22 cm.</extent>
+        </physicalDescription>
+        <abstract>A talking cat, intelligent rats, and a strange boy cooperate in a Pied Piper scam until they try to con the wrong town and are confronted by a deadly evil rat king.</abstract>
+        <targetAudience authority="marctarget">juvenile</targetAudience>
+        <note type="statement of responsibility">Terry Pratchett.</note>
+        <note>Carnegie Medal winner.</note>
+        <subject authority="lcsh">
+            <topic>Discworld (Imaginary place)</topic>
+            <topic>Fiction</topic>
+        </subject>
+        <subject authority="lcsh">
+            <topic>Discworld (Imaginary place)</topic>
+            <topic>Fiction</topic>
+        </subject>
+        <subject authority="lcsh">
+            <topic>Rats</topic>
+            <topic>Fiction</topic>
+        </subject>
+        <subject authority="lcsh">
+            <topic>Cats</topic>
+            <topic>Fiction</topic>
+        </subject>
+        <subject authority="lcsh">
+            <topic>Fantasy fiction</topic>
+        </subject>
+        <subject authority="lcsh">
+            <topic>Humorous stories</topic>
+        </subject>
+        <classification authority="lcc">PZ7.P8865 Am 2002</classification>
+        <relatedItem>
+            <titleInfo>
+                <title>Discworld series</title>
+            </titleInfo>
+            <name type="personal">
+                <namePart>Pratchett, Terry.</namePart>
+            </name>
+        </relatedItem>
+        <identifier type="isbn">006001234X (library binding)</identifier>
+        <identifier type="isbn">0385601239</identifier>
+        <identifier type="isbn">0552546933 (pbk.)</identifier>
+        <recordInfo>
+            <recordContentSource authority="marcorg">CaNWHRN</recordContentSource>
+            <recordCreationDate encoding="marc">010730</recordCreationDate>
+            <recordChangeDate encoding="iso8601">20020314      .0</recordChangeDate>
+            <languageOfCataloging>
+                <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
+            </languageOfCataloging>
+        </recordInfo>
+    </mods:mods>
 </mods:modsCollection>
 

ilives/xml/book_collection_policy.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection_policy xmlns="http://www.islandora.ca" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="" xsi:schemaLocation="http://www.islandora.ca http://syn.lib.umanitoba.ca/collection_policy.xsd">
-  <content_models>
-    <content_model dsid="ISLANDORACM" name="Book" namespace="islandora" pid="ilives:bookCModel"></content_model>
-  </content_models>
-  <search_terms>
-    <term field="dc.title">dc.title</term>
-    <term field="dc.creator">dc.creator</term>
-    <term default="true" field="dc.description">dc.description</term>
-    <term field="dc.date">dc.date</term>
-    <term field="dc.identifier">dc.identifier</term>
-    <term field="dc.language">dc.language</term>
-    <term field="dc.publisher">dc.publisher</term>
-    <term field="dc.rights">dc.rights</term>
-    <term field="dc.subject">dc.subject</term>
-    <term field="dc.relation">dc.relation</term>
-    <term field="dcterms.temporal">dcterms.temporal</term>
-    <term field="dcterms.spatial">dcterms.spatial</term>
-    <term field="fgs.DS.first.text">Full Text</term>
-  </search_terms>
-  <relationship>isMemberOfCollection</relationship>
+    <content_models>
+        <content_model dsid="ISLANDORACM" name="Book" namespace="islandora" pid="ilives:bookCModel"></content_model>
+    </content_models>
+    <search_terms>
+        <term field="dc.title">dc.title</term>
+        <term field="dc.creator">dc.creator</term>
+        <term default="true" field="dc.description">dc.description</term>
+        <term field="dc.date">dc.date</term>
+        <term field="dc.identifier">dc.identifier</term>
+        <term field="dc.language">dc.language</term>
+        <term field="dc.publisher">dc.publisher</term>
+        <term field="dc.rights">dc.rights</term>
+        <term field="dc.subject">dc.subject</term>
+        <term field="dc.relation">dc.relation</term>
+        <term field="dcterms.temporal">dcterms.temporal</term>
+        <term field="dcterms.spatial">dcterms.spatial</term>
+        <term field="fgs.DS.first.text">Full Text</term>
+    </search_terms>
+    <relationship>isMemberOfCollection</relationship>
 </collection_policy>

ilives/xml/ilives_CollectionModel.xml

@@ -3,95 +3,95 @@
 xmlns:foxml="info:fedora/fedora-system:def/foxml#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="IslandLives Collection Model"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-01-23T20:43:42.518Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2009-09-14T14:09:41.955Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
-<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-01-23T20:43:42.518Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
-<foxml:xmlContent>
-<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-<audit:record ID="AUDREC1">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-01-23T20:43:42.518Z</audit:date>
-<audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC2">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>RELS-EXT</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-01-23T20:45:33.190Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC3">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>DC</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-01-23T20:48:22.246Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC4">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-01-26T20:27:14.697Z</audit:date>
-<audit:justification>Ingested from local file /opt/fedora/export/ilives_CollectionModel.xml</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC5">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-03-21T22:35:49.622Z</audit:date>
-<audit:justification>Ingested from local file /Volumes/iLives/iLivesTexts/215258_jpg/Content_Models/CollectionCModel.xml</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC6">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>admin</audit:responsibility>
-<audit:date>2009-09-14T14:09:41.955Z</audit:date>
-<audit:justification>Fedora Object Ingested</audit:justification>
-</audit:record>
-</audit:auditTrail>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" CREATED="2009-01-23T20:43:44.131Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="366">
-<foxml:xmlContent>
-<rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:CollectionModel">
-            <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"></fedora-model:hasModel>
-          </rdf:Description>
-        </rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="RELS-EXT.1" LABEL="RDF Statements about this object" CREATED="2009-01-23T20:45:33.190Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="457">
-<foxml:xmlContent>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/ilives:CollectionModel">
-            <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ContentModel-3.0"></hasModel>
-            <hasMember xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="ilives:lowerfreetown"></hasMember>
-          </rdf:Description>
-        </rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DS-COMPOSITE-MODEL" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DS-COMPOSITE-MODEL1.0" LABEL="Datastream Composite Model" CREATED="2009-01-23T20:43:44.131Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSCompositeModel-1.0" SIZE="1120">
-<foxml:xmlContent>
-<dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
-          <comment xmlns="info:fedora/fedora-system:def/comment#">
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="IslandLives Collection Model"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-01-23T20:43:42.518Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2009-09-14T14:09:41.955Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
+        <foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-01-23T20:43:42.518Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-01-23T20:43:42.518Z</audit:date>
+                        <audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>RELS-EXT</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-01-23T20:45:33.190Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC3">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>DC</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-01-23T20:48:22.246Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC4">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-01-26T20:27:14.697Z</audit:date>
+                        <audit:justification>Ingested from local file /opt/fedora/export/ilives_CollectionModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC5">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-03-21T22:35:49.622Z</audit:date>
+                        <audit:justification>Ingested from local file /Volumes/iLives/iLivesTexts/215258_jpg/Content_Models/CollectionCModel.xml</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC6">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>admin</audit:responsibility>
+                        <audit:date>2009-09-14T14:09:41.955Z</audit:date>
+                        <audit:justification>Fedora Object Ingested</audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" CREATED="2009-01-23T20:43:44.131Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="366">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:CollectionModel">
+                        <fedora-model:hasModel rdf:resource="info:fedora/fedora-system:ContentModel-3.0"></fedora-model:hasModel>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="RELS-EXT.1" LABEL="RDF Statements about this object" CREATED="2009-01-23T20:45:33.190Z" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0" SIZE="457">
+            <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description rdf:about="info:fedora/ilives:CollectionModel">
+                        <hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/fedora-system:ContentModel-3.0"></hasModel>
+                        <hasMember xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="ilives:lowerfreetown"></hasMember>
+                    </rdf:Description>
+                </rdf:RDF>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="DS-COMPOSITE-MODEL" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DS-COMPOSITE-MODEL1.0" LABEL="Datastream Composite Model" CREATED="2009-01-23T20:43:44.131Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:FedoraDSCompositeModel-1.0" SIZE="1120">
+            <foxml:xmlContent>
+                <dsCompositeModel xmlns="info:fedora/fedora-system:def/dsCompositeModel#">
+                    <comment xmlns="info:fedora/fedora-system:def/comment#">
             This DS-COMPOSITE-MODEL datastream is included as a starting point to
               assist in the creation of a content model. The DS-COMPOSITE-MODEL
               should define the datastreams that are required for any objects
@@ -104,35 +104,36 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
               demo:TEI_TO_PDFDOC, and demo:XML_TO_HTMLDOC.
             For more information about the demonstration objects, see:
               http://fedora-commons.org/confluence/x/AwFI.
-          </comment>
-          <dsTypeModel ID="DSID">
-            <form MIME="text/xml"></form>
-          </dsTypeModel>
-        </dsCompositeModel>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-01-23T20:43:42.518Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="427">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:title>IslandLives Collection Model</dc:title>
-          <dc:identifier>ilives:CollectionModel</dc:identifier>
-        </oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2009-01-23T20:48:22.246Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="1812">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>IslandLives Collection</dc:title>
-  <dc:description>Made possible through a generous private donation, the IslandLives project builds on the Robertson Library’s mission to preserve and share unique material relating to Prince Edward Island and demonstrates UPEI&apos;s ongoing commitment to making PEI&apos;s cultural and published heritage available to all.
+                    </comment>
+                    <dsTypeModel ID="DSID">
+                        <form MIME="text/xml"></form>
+                    </dsTypeModel>
+                </dsCompositeModel>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-01-23T20:43:42.518Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="427">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>IslandLives Collection Model</dc:title>
+                    <dc:identifier>ilives:CollectionModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2009-01-23T20:48:22.246Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="1812">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>IslandLives Collection</dc:title>
+                    <dc:description>Made possible through a generous private donation, the IslandLives project builds on the Robertson Library’s mission to preserve and share unique material relating to Prince Edward Island and demonstrates UPEI&apos;s ongoing commitment to making PEI&apos;s cultural and published heritage available to all.
 Utilizing the library’s “Prince Edward Island Collection” and the latest in digitization technology, IslandLives will start by digitizing 300 or so published community histories dating from the mid-1800’s to the present day.  These transformed community histories will form the basis of a rich online repository.
 IslandLives will provide a variety of search interfaces that will allow users to browse and search the content by name, community, time period, and keyword. The Island community will have a whole new way to rediscover, search and share their stories.  
-This project will engage and build community – recruiting interested individuals from the cultural heritage community and everyday Islanders. Project staff will travel to communities and host ‘digitization days’, introducing community members to the project and its goals, providing them with an opportunity to digitize their own content, and to contribute their content to the IslandLives collection.</dc:description>
-  <dc:contributor>Robertson Library, University of Prince Edward Island</dc:contributor>
-  <dc:identifier>ilives:CollectionModel</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
+This project will engage and build community – recruiting interested individuals from the cultural heritage community and everyday Islanders. Project staff will travel to communities and host ‘digitization days’, introducing community members to the project and its goals, providing them with an opportunity to digitize their own content, and to contribute their content to the IslandLives collection.
+                    </dc:description>
+                    <dc:contributor>Robertson Library, University of Prince Edward Island</dc:contributor>
+                    <dc:identifier>ilives:CollectionModel</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

ilives/xml/ilives_collection.xml

@@ -3,54 +3,54 @@
 xmlns:foxml="info:fedora/fedora-system:def/foxml#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="IslandLives Collection"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-14T19:32:21.132Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2009-05-14T19:35:11.912Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
-<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-05-14T19:32:21.132Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
-<foxml:xmlContent>
-<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-<audit:record ID="AUDREC1">
-<audit:process type="Fedora API-M"/>
-<audit:action>ingest</audit:action>
-<audit:componentID></audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-05-14T19:32:21.132Z</audit:date>
-<audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
-</audit:record>
-<audit:record ID="AUDREC2">
-<audit:process type="Fedora API-M"/>
-<audit:action>modifyDatastreamByValue</audit:action>
-<audit:componentID>DC</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2009-05-14T19:35:11.912Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-</audit:auditTrail>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-05-14T19:32:21.132Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="392">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>IslandLives Collection</dc:title>
-  <dc:identifier>ilives:collection</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-<foxml:datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2009-05-14T19:35:11.912Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="783">
-<foxml:xmlContent>
-<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:title>IslandLives Collection</dc:title>
-  <dc:description>Made possible through a generous private donation, IslandLives contains community and church histories and it builds on the Robertson Library&apos;s mission to preserve and share unique material relating to Prince Edward Island and demonstrates UPEI&quot;s ongoing commitment to making PEI&quot;s cultural and published heritage available to all. Welcome.</dc:description>
-  <dc:identifier>ilives:collection</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
+    <foxml:objectProperties>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="IslandLives Collection"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2009-05-14T19:32:21.132Z"/>
+        <foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2009-05-14T19:35:11.912Z"/>
+    </foxml:objectProperties>
+    <foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
+        <foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2009-05-14T19:32:21.132Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
+            <foxml:xmlContent>
+                <audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+                    <audit:record ID="AUDREC1">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>ingest</audit:action>
+                        <audit:componentID></audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-05-14T19:32:21.132Z</audit:date>
+                        <audit:justification>Created with Admin GUI &quot;New Object&quot; command</audit:justification>
+                    </audit:record>
+                    <audit:record ID="AUDREC2">
+                        <audit:process type="Fedora API-M"/>
+                        <audit:action>modifyDatastreamByValue</audit:action>
+                        <audit:componentID>DC</audit:componentID>
+                        <audit:responsibility>fedoraAdmin</audit:responsibility>
+                        <audit:date>2009-05-14T19:35:11.912Z</audit:date>
+                        <audit:justification></audit:justification>
+                    </audit:record>
+                </audit:auditTrail>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
+    <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+        <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2009-05-14T19:32:21.132Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="392">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>IslandLives Collection</dc:title>
+                    <dc:identifier>ilives:collection</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+        <foxml:datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2009-05-14T19:35:11.912Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="783">
+            <foxml:xmlContent>
+                <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>IslandLives Collection</dc:title>
+                    <dc:description>Made possible through a generous private donation, IslandLives contains community and church histories and it builds on the Robertson Library&apos;s mission to preserve and share unique material relating to Prince Edward Island and demonstrates UPEI&quot;s ongoing commitment to making PEI&quot;s cultural and published heritage available to all. Welcome.</dc:description>
+                    <dc:identifier>ilives:collection</dc:identifier>
+                </oai_dc:dc>
+            </foxml:xmlContent>
+        </foxml:datastreamVersion>
+    </foxml:datastream>
 </foxml:digitalObject>

ilives/xml/ilives_figuresCModel.xml

@@ -1,20 +1,20 @@
 
 <content_model name="standard_jpeg">
-  <mimetypes>
-    <type>image/jpeg</type>
-  </mimetypes>
-  <display_in_fieldset>
-    <datastream id="JPG">
-      <method>
-        <module>fedora_ilives</module>
-        <file>image_rotator_tagger_block.inc</file>
-        <class_name>ShowILivesStreamsInFieldSets</class_name>
-        <method_name>showJPG</method_name>
-      </method>
-    </datastream>
-    <datastream id="JPG">
-      <allowed_mime_type>image/jpeg</allowed_mime_type>
-    </datastream>
-  </display_in_fieldset>
-  <ingest_rules></ingest_rules>
+    <mimetypes>
+        <type>image/jpeg</type>
+    </mimetypes>
+    <display_in_fieldset>
+        <datastream id="JPG">
+            <method>
+                <module>fedora_ilives</module>
+                <file>image_rotator_tagger_block.inc</file>
+                <class_name>ShowILivesStreamsInFieldSets</class_name>
+                <method_name>showJPG</method_name>
+            </method>
+        </datastream>
+        <datastream id="JPG">
+            <allowed_mime_type>image/jpeg</allowed_mime_type>
+        </datastream>
+    </display_in_fieldset>
+    <ingest_rules></ingest_rules>
 </content_model>