ISLANDORA-278 Initial pass at making the islandora code conform to the drupal coding standards.

CollectionClass.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 /*
  * Created on 18-Feb-08
@@ -378,8 +378,8 @@ class CollectionClass {
         'pidNamespace' => $pidNameSpace
       );
       $object = $soapClient->__soapCall('getNextPID', array(
-            $params
-          ));
+          $params
+        ));
     } catch (exception $e) {
       drupal_set_message(t('Error getting Next PID: !e', array('!e' => $e->getMessage())), 'error');
       return FALSE;

CollectionPolicy.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 module_load_include('inc', 'fedora_repository', 'XMLDatastream');
 
@@ -8,8 +8,7 @@ class CollectionPolicy extends XMLDatastream {
 
   static $SCHEMA_URI = 'http://syn.lib.umanitoba.ca/collection_policy.xsd';
   static $DEFAULT_DSID = 'COLLECTION_POLICY';
-
-  private $staging_area=NULL;
+  private $staging_area = NULL;
 
   /**
    * Gets the default DSID to use for ContentModel datastreams.
@@ -36,22 +35,21 @@ class CollectionPolicy extends XMLDatastream {
 
     try {
       if (self::validPid($pid)) {
-        $dsid=CollectionPolicy::getDefaultDSID();
+        $dsid = CollectionPolicy::getDefaultDSID();
 
         if ($preFetch) {
           $fedoraItem = new Fedora_Item($pid);
           $ds = $fedoraItem->get_datastream_dissemination($dsid);
-        } else {
-          $ds=null;
         }
-
+        else {
+          $ds = NULL;
+        }
       }
 
       if (!empty($ds) || !$preFetch) {
-        $ret=new CollectionPolicy($ds, $pid, $dsid);
+        $ret = new CollectionPolicy($ds, $pid, $dsid);
       }
-    } 
-    catch (SOAPException $e) {
+    } catch (SOAPException $e) {
 
       $ret = FALSE;
     }
@@ -133,7 +131,7 @@ class CollectionPolicy extends XMLDatastream {
    */
   public static function ingestBlankPolicy($pid, $name, $policyDsid, $model_pid, $model_namespace, $relationship, $searchField, $searchValue) {
     $ret = FALSE;
-    if (($cp = self::loadFromCollection($pid )) === FALSE) {   //removed second, non-existant variable
+    if (($cp = self::loadFromCollection($pid)) === FALSE) {   //removed second, non-existant variable
       module_load_include('inc', 'fedora_repository', 'ContentModel');
       if (($cm = ContentModel::loadFromModel($model_pid)) !== FALSE && $cm->validate()) {
         $newDom = new DOMDocument('1.0', 'utf-8');
@@ -142,7 +140,7 @@ class CollectionPolicy extends XMLDatastream {
         $rootEl->setAttribute('name', $name);
         $rootEl->setAttribute('xmlns', self::$XMLNS);
         $rootEl->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $rootEl->setAttribute('xsi:schemaLocation', self::$XMLNS .' '. self::$SCHEMA_URI);
+        $rootEl->setAttribute('xsi:schemaLocation', self::$XMLNS . ' ' . self::$SCHEMA_URI);
 
         $modelsEl = $newDom->createElement('content_models');
 
@@ -175,13 +173,11 @@ class CollectionPolicy extends XMLDatastream {
         $fedoraItem->add_datastream_from_string($cp->dumpXml(), $policyDsid, $name, 'text/xml', 'X');
         $ret = $cp;
       }
-      
     }
 
     return $ret;
   }
 
-
   /**
    * Constructor
    * NOTE: Use the static constructor methods whenever possible.
@@ -192,8 +188,8 @@ class CollectionPolicy extends XMLDatastream {
    * @return XMLDatastream $cm
    */
   public function __construct($xmlStr, $pid = NULL, $dsid = NULL) {
-      parent::__construct($xmlStr,$pid,$dsid);
-      $this->name= 'Collection Policy';
+    parent::__construct($xmlStr, $pid, $dsid);
+    $this->name = 'Collection Policy';
   }
 
   /**
@@ -215,7 +211,7 @@ class CollectionPolicy extends XMLDatastream {
     $rootEl->setAttribute('name', $sXml['name']);
     $rootEl->setAttribute('xmlns', self::$XMLNS);
     $rootEl->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-    $rootEl->setAttribute('xsi:schemaLocation', self::$XMLNS .' '. self::$SCHEMA_URI);
+    $rootEl->setAttribute('xsi:schemaLocation', self::$XMLNS . ' ' . self::$SCHEMA_URI);
 
     $content_modelsEl = $newDom->createElement('content_models');
     foreach ($sXml->contentmodels->contentmodel as $contentmodel) {
@@ -233,7 +229,7 @@ class CollectionPolicy extends XMLDatastream {
       $termEl = $newDom->createElement('term', $term->value);
       $termEl->setAttribute('field', $term->field);
       if (strval($sXml->search_terms->default) == $term->field) {
-  $termEl->setAttribute('default', 'true');
+        $termEl->setAttribute('default', 'true');
       }
       $search_termsEl->appendChild($termEl);
     }
@@ -247,7 +243,6 @@ class CollectionPolicy extends XMLDatastream {
     $this->xml = DOMDocument::loadXML($newDom->saveXml());
   }
 
-
   /**
    * Gets the name of the relationship to use 
    * for members of this collection. 
@@ -256,14 +251,14 @@ class CollectionPolicy extends XMLDatastream {
    * @return string $relationship
    */
   public function getRelationship() {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
-      $ret=trim($this->xml->getElementsByTagName('relationship')->item(0)->nodeValue);
+      $ret = trim($this->xml->getElementsByTagName('relationship')->item(0)->nodeValue);
     }
     return $ret;
   }
 
-   /**
+  /**
    * Sets the name of the relationship to use 
    * for members of this collection. 
    * Returns FALSE on failure.
@@ -272,16 +267,16 @@ class CollectionPolicy extends XMLDatastream {
    * @return boolean $ret
    */
   public function setRelationship($relationship) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
-      $relationshipEl=$this->xml->getElementsByTagName('relationship')->item(0);
-      $relationshipEl->nodeValue=trim($relationship);
+      $relationshipEl = $this->xml->getElementsByTagName('relationship')->item(0);
+      $relationshipEl->nodeValue = trim($relationship);
       $ret = TRUE;
     }
     return $ret;
   }
 
-    /**
+  /**
    * Gets the path to the staging area to use for this 
    * collection. By default recurses to the parent collection
    * if the staging area is undefined
@@ -290,17 +285,18 @@ class CollectionPolicy extends XMLDatastream {
    * @return string $path
    */
   public function getStagingArea($recurse=TRUE) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
       if ($this->staging_area === NULL) {
-        $stagingEl=$this->xml->getElementsByTagName('staging_area');
+        $stagingEl = $this->xml->getElementsByTagName('staging_area');
 
         if ($stagingEl->length > 0) {
           $this->staging_area = trim($stagingEl->item(0)->nodeValue);
-        } elseif ($recurse) {
+        }
+        elseif ($recurse) {
           module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-          $item=new Fedora_Item($this->pid);
-          $rels=$item->get_relationships();
+          $item = new Fedora_Item($this->pid);
+          $rels = $item->get_relationships();
           if (count($rels) > 0) {
             foreach ($rels as $rel) {
               $cp = CollectionPolicy::loadFromCollection($rel['object']);
@@ -314,12 +310,11 @@ class CollectionPolicy extends XMLDatastream {
       }
 
       $ret = $this->staging_area;
-      
     }
     return $ret;
   }
 
-    /**
+  /**
    * Sets the path to the staging area to use for this 
    * collection. If specified path is blank (or false) it will
    * remove the staging are path element from the collection policy.
@@ -329,22 +324,22 @@ class CollectionPolicy extends XMLDatastream {
    * @return string $relationship
    */
   public function setStagingArea($path) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
-     $rootEl=$this->xml->getElementsByTagName('collection_policy')->item(0);
-      $stagingEl=$this->xml->getElementsByTagName('staging_area');
+      $rootEl = $this->xml->getElementsByTagName('collection_policy')->item(0);
+      $stagingEl = $this->xml->getElementsByTagName('staging_area');
       if ($stagingEl->length > 0) {
-  $stagingEl=$stagingEl->item(0);
-  if (trim($path) == '') {
-    $rootEl->removeChild($stagingEl);
-  } 
+        $stagingEl = $stagingEl->item(0);
+        if (trim($path) == '') {
+          $rootEl->removeChild($stagingEl);
+        }
         else {
-    $stagingEl->nodeValue=trim($path);
-  }
+          $stagingEl->nodeValue = trim($path);
+        }
       }
       elseif (trim($path) != '') {
-   $stagingEl=$this->xml->createElement('staging_area', trim($path));
-   $rootEl->appendChild($stagingEl);
+        $stagingEl = $this->xml->createElement('staging_area', trim($path));
+        $rootEl->appendChild($stagingEl);
       }
 
       $ret = TRUE;
@@ -352,21 +347,20 @@ class CollectionPolicy extends XMLDatastream {
     return $ret;
   }
 
-  
   /**
-  * Gets the next available PID for the 
-  * content model specified by the DSID 
-  * parameter.
-  *
-  * @param string $dsid
-  * @return string $nextPid
-  */
+   * Gets the next available PID for the
+   * content model specified by the DSID
+   * parameter.
+   *
+   * @param string $dsid
+   * @return string $nextPid
+   */
   public function getNextPid($dsid) {
     $ret = FALSE;
     if (self::validDsid($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++) {
+      for ($i = 0; $namespace === FALSE && $i < $content_models->length; $i++) {
         if (strtolower($content_models->item($i)->getAttribute('dsid')) == strtolower($dsid)) {
           $namespace = $content_models->item($i)->getAttribute('namespace');
         }
@@ -381,32 +375,29 @@ class CollectionPolicy extends XMLDatastream {
   }
 
   /**
-  * Gets a list of ContentModel objects supported by this collection.
-  *
-  * @return ContentModel[] $models 
-  */
+   * Gets a list of ContentModel objects supported by this collection.
+   *
+   * @return ContentModel[] $models
+   */
   function getContentModels() {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
       module_load_include('inc', 'Fedora_Repository', 'ContentModel');
-      $ret=array();
+      $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'));
-            if ($cm !== FALSE) {
-              $ret[]=$cm;
-            }
-
+      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'));
+        if ($cm !== FALSE) {
+          $ret[] = $cm;
+        }
       }
     }
     return $ret;
   }
 
-
-
   /**
    * Gets a list of search terms from the Collection Policy.  If asArray is set
    * it will return an associative array with the value, field name, and the default value. 
@@ -422,51 +413,50 @@ class CollectionPolicy extends XMLDatastream {
   function getSearchTerms($asArray = FALSE, $recurse = FALSE, $cache = FALSE) {
     $ret = FALSE;
 
-    if ($cache == TRUE && ($cache = cache_get('collection_policy_search_terms-'.$this->pid)) !== 0 ) {
-      $ret=$cache->data; 
-    } else {
+    if ($cache == TRUE && ($cache = cache_get('collection_policy_search_terms-' . $this->pid)) !== 0) {
+      $ret = $cache->data;
+    }
+    else {
 
       if ($this->xml == NULL) {
-	  $fedoraItem = new Fedora_Item($this->pid);
-	  $ds = $fedoraItem->get_datastream_dissemination($this->dsid); 
-	  $this->xml = DOMDocument::loadXML($ds);  
+        $fedoraItem = new Fedora_Item($this->pid);
+        $ds = $fedoraItem->get_datastream_dissemination($this->dsid);
+        $this->xml = DOMDocument::loadXML($ds);
       }
 
 
       if ($this->validate()) {
-	$ret=array();
-	$terms= $this->xml->getElementsByTagName('search_terms')->item(0)->getElementsByTagName('term');
-	for ($i=0;$i<$terms->length;$i++) {
-	  $default = $terms->item($i)->attributes->getNamedItem('default');
-	  $default = ($default !== NULL) ? (strtolower($default->nodeValue) == 'true') : FALSE;
-	  $ret[] = ($asArray)?array( 'value' => $terms->item($i)->nodeValue, 
-	    'field' => $terms->item($i)->getAttribute('field'),
-	    'default' => $default): $terms->item($i)->nodeValue;
-	}
-	
-	
-	if ($recurse && count($ret) == 0) {
-	  module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-	  $item=new Fedora_Item($this->pid);
-	  $rels=$item->get_relationships();
-	  if (count($rels) > 0) {
-	    foreach ($rels as $rel) {
-	      $cp = CollectionPolicy::loadFromCollection($rel['object']);
-	      if ($cp !== FALSE) {
-		$ret = $cp->getSearchTerms($asArray, $recurse);
-		break;
-	      }
-	    }
-	  }
-	}
-	cache_set('collection_policy_search_terms-'.$this->pid, $ret, 'cache', time()+3600);
+        $ret = array();
+        $terms = $this->xml->getElementsByTagName('search_terms')->item(0)->getElementsByTagName('term');
+        for ($i = 0; $i < $terms->length; $i++) {
+          $default = $terms->item($i)->attributes->getNamedItem('default');
+          $default = ($default !== NULL) ? (strtolower($default->nodeValue) == 'true') : FALSE;
+          $ret[] = ($asArray) ? array('value' => $terms->item($i)->nodeValue,
+            'field' => $terms->item($i)->getAttribute('field'),
+            'default' => $default) : $terms->item($i)->nodeValue;
+        }
+
 
+        if ($recurse && count($ret) == 0) {
+          module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+          $item = new Fedora_Item($this->pid);
+          $rels = $item->get_relationships();
+          if (count($rels) > 0) {
+            foreach ($rels as $rel) {
+              $cp = CollectionPolicy::loadFromCollection($rel['object']);
+              if ($cp !== FALSE) {
+                $ret = $cp->getSearchTerms($asArray, $recurse);
+                break;
+              }
+            }
+          }
+        }
+        cache_set('collection_policy_search_terms-' . $this->pid, $ret, 'cache', time() + 3600);
       }
     }
     return $ret;
   }
 
-
   /**
    * Adds a search term to the collection policy.  
    * Returns fase on failure.
@@ -476,12 +466,12 @@ class CollectionPolicy extends XMLDatastream {
    * @return boolean $success
    */
   function addTerm($field, $value) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
       $search_termsEl = $this->xml->getElementsByTagName('search_terms')->item(0);
-      $terms= $search_termsEl->getElementsByTagName('term');
-      $found=FALSE;
-      for ($i=0;!$found && $i<$terms->length;$i++) {
+      $terms = $search_termsEl->getElementsByTagName('term');
+      $found = FALSE;
+      for ($i = 0; !$found && $i < $terms->length; $i++) {
         if ($terms->item($i)->getAttribute('field') == $field) {
           $found = TRUE;
         }
@@ -504,12 +494,12 @@ class CollectionPolicy extends XMLDatastream {
    * @return boolean $success
    */
   function removeTerm($field) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
       $search_termsEl = $this->xml->getElementsByTagName('search_terms')->item(0);
       $terms = $search_termsEl->getElementsByTagName('term');
       $found = FALSE;
-      for ($i=0; !$found && $i < $terms->length; $i++) {
+      for ($i = 0; !$found && $i < $terms->length; $i++) {
         if ($terms->item($i)->getAttribute('field') == $field) {
           $found = $terms->item($i);
         }
@@ -523,21 +513,20 @@ class CollectionPolicy extends XMLDatastream {
     return $ret;
   }
 
- 
- function setDefaultTerm($field) {
+  function setDefaultTerm($field) {
     $ret = FALSE;
     if ($this->validate()) {
       $search_termsEl = $this->xml->getElementsByTagName('search_terms')->item(0);
-      $terms= $search_termsEl->getElementsByTagName('term');
-      $found=FALSE;
-      for ($i=0;!$found && $i<$terms->length;$i++) {
+      $terms = $search_termsEl->getElementsByTagName('term');
+      $found = FALSE;
+      for ($i = 0; !$found && $i < $terms->length; $i++) {
         if ($terms->item($i)->getAttribute('field') == $field) {
           $found = $terms->item($i);
         }
       }
 
       if ($found !== FALSE) {
-        for ($i=0;$i<$terms->length;$i++)
+        for ($i = 0; $i < $terms->length; $i++)
           if ($terms->item($i)->attributes->getNamedItem('default') !== NULL) {
             $terms->item($i)->removeAttribute('default');
           }
@@ -548,7 +537,6 @@ class CollectionPolicy extends XMLDatastream {
     return $ret;
   }
 
-  
   /**
    * Removes the specified content model from the collection policy.  This will only 
    * prevent future ingests of the removed model to the collection.  $cm should be 
@@ -559,14 +547,14 @@ class CollectionPolicy extends XMLDatastream {
    * @return boolean $valid
    */
   function removeModel($cm) {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate() && $cm->validate()) {
       $contentmodelsEl = $this->xml->getElementsByTagName('content_models');
       $models = $contentmodelsEl->item(0)->getElementsByTagName('content_model');
       $found = FALSE;
-      for ($i=0; $found === FALSE && $i < $models->length; $i++) {
+      for ($i = 0; $found === FALSE && $i < $models->length; $i++) {
         if ($models->item($i)->getAttribute('pid') == $cm->pid) {
-          $found=$models->item($i);
+          $found = $models->item($i);
         }
       }
 
@@ -578,16 +566,13 @@ class CollectionPolicy extends XMLDatastream {
     return $ret;
   }
 
-
-  
-  
   function addModel($cm, $namespace) {
     $ret = FALSE;
     if (self::validPid($namespace) && $this->validate() && $cm->validate()) {
       $contentmodelsEl = $this->xml->getElementsByTagName('content_models');
       $models = $contentmodelsEl->item(0)->getElementsByTagName('content_model');
       $found = FALSE;
-      for ($i=0;!$found && $i<$models->length;$i++) {
+      for ($i = 0; !$found && $i < $models->length; $i++) {
         if ($models->item($i)->getAttribute('pid') == $cm->pid)
           $found = TRUE;
       }
@@ -607,9 +592,9 @@ class CollectionPolicy extends XMLDatastream {
   }
 
   function getName() {
-    $ret=FALSE;
+    $ret = FALSE;
     if ($this->validate()) {
-      $ret=$this->xml->getElementsByTagName('collection_policy')->item(0)->getAttribute('name');
+      $ret = $this->xml->getElementsByTagName('collection_policy')->item(0)->getAttribute('name');
     }
     return $ret;
   }

ConnectionHelper.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * Created on Jan 24, 2008
@@ -9,23 +10,25 @@
  */
 
 module_load_include('inc', 'ConnectionHelper', '');
+
 class ConnectionHelper {
+
   function ConnectionHelper() {
     drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
   }
 
   function _fixURL($url, $_name, $_pass) {
     if (empty($url)) {
-      $url=variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
+      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
     }
 
-    $creds = urlencode($_name) . ':'. urlencode($_pass);
+    $creds = urlencode($_name) . ':' . urlencode($_pass);
 
     if (strpos($url, 'http://') === 0) {
-      $new_url = 'http://'. $creds . '@'. substr($url, 7);
+      $new_url = 'http://' . $creds . '@' . substr($url, 7);
     }
     elseif (strpos($url, 'https://') === 0) {
-      $new_url = 'https://'. $creds . '@'. substr($url, 8);
+      $new_url = 'https://' . $creds . '@' . substr($url, 8);
     }
     else {
       drupal_set_message(t('Invalid URL: !url', array('!url' => $url)));
@@ -37,7 +40,7 @@ class ConnectionHelper {
 
   function getSoapClient($url = NULL, $exceptions = TRUE) {
     if (empty($url)) {
-      $url=variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
+      $url = variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
     }
 
     global $user;
@@ -49,9 +52,8 @@ class ConnectionHelper {
             'login' => 'anonymous',
             'password' => 'anonymous',
             'exceptions' => $exceptions,
-        ));
-      } 
-      catch (SoapFault $e) {
+          ));
+      } catch (SoapFault $e) {
         drupal_set_message(t("!e", array('!e' => $e->getMessage())));
         return NULL;
       }
@@ -62,14 +64,14 @@ class ConnectionHelper {
             'login' => $user->name,
             'password' => $user->pass,
             'exceptions' => TRUE,
-        ));
-      } 
-      catch (SoapFault $e) {
+          ));
+      } catch (SoapFault $e) {
         drupal_set_message(t("!e", array('!e' => $e->getMessage())));
         return NULL;
       }
     }
     return $client;
   }
+
 }
 

MimeClass.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /**
  *
@@ -20,177 +21,176 @@
  * http://api.drupal.org/api/function/file_default_mimetype_mapping/7
  *
  */
-
 class MimeClass {
+
   private $private_mime_types = array(
-  /**
-   * This is a shortlist of mimetypes which should catch most 
-   * mimetype<-->extension lookups in the context of Islandora collections.
-   *
-   * It has been cut from a much longer list.
-   *
-   * Two types of mimetypes should be put in this list:
-   *  1) Special emerging formats which may not yet be expressed in the system
-   *     mime.types file.
-   *  2) Heavily used mimetypes of particular importance to the Islandora 
-   *     project, as lookups against this list will be quicker and less 
-   *     resource intensive than other methods.
-   *
-   * Lookups are first checked against this short list.  If no results are found,
-   * then the lookup function may move on to check other sources, namely the 
-   * system's mime.types file.
-   *
-   * In most cases though, this short list should suffice.
-   * 
-   * If modifying this list, please note that for promiscuous mimetypes
-   * (those which map to multiple extensions, such as text/plain)
-   * The function get_extension will always return the *LAST* extension in this list,
-   * so you should put your preferred extension *LAST*.
-   *
-   * e.g... 
-   * "jpeg"    => "image/jpeg",
-   * "jpe"     => "image/jpeg",
-   * "jpg"     => "image/jpeg",
-   * 
-   * $this->get_extension('image/jpeg') will always return 'jpg'.
-   *
-   */
+    /**
+     * This is a shortlist of mimetypes which should catch most
+     * mimetype<-->extension lookups in the context of Islandora collections.
+     *
+     * It has been cut from a much longer list.
+     *
+     * Two types of mimetypes should be put in this list:
+     *  1) Special emerging formats which may not yet be expressed in the system
+     *     mime.types file.
+     *  2) Heavily used mimetypes of particular importance to the Islandora
+     *     project, as lookups against this list will be quicker and less
+     *     resource intensive than other methods.
+     *
+     * Lookups are first checked against this short list.  If no results are found,
+     * then the lookup function may move on to check other sources, namely the
+     * system's mime.types file.
+     *
+     * In most cases though, this short list should suffice.
+     *
+     * If modifying this list, please note that for promiscuous mimetypes
+     * (those which map to multiple extensions, such as text/plain)
+     * The function get_extension will always return the *LAST* extension in this list,
+     * so you should put your preferred extension *LAST*.
+     *
+     * e.g...
+     * "jpeg"    => "image/jpeg",
+     * "jpe"     => "image/jpeg",
+     * "jpg"     => "image/jpeg",
+     *
+     * $this->get_extension('image/jpeg') will always return 'jpg'.
+     *
+     */
     // openoffice:
-    'odb'     => 'application/vnd.oasis.opendocument.database',
-    'odc'     => 'application/vnd.oasis.opendocument.chart',
-    'odf'     => 'application/vnd.oasis.opendocument.formula',
-    'odg'     => 'application/vnd.oasis.opendocument.graphics',
-    'odi'     => 'application/vnd.oasis.opendocument.image',
-    'odm'     => 'application/vnd.oasis.opendocument.text-master',
-    'odp'     => 'application/vnd.oasis.opendocument.presentation',
-    'ods'     => 'application/vnd.oasis.opendocument.spreadsheet',
-    'odt'     => 'application/vnd.oasis.opendocument.text',
-    'otg'     => 'application/vnd.oasis.opendocument.graphics-template',
-    'oth'     => 'application/vnd.oasis.opendocument.text-web',
-    'otp'     => 'application/vnd.oasis.opendocument.presentation-template',
-    'ots'     => 'application/vnd.oasis.opendocument.spreadsheet-template',
-    'ott'     => 'application/vnd.oasis.opendocument.text-template',
+    'odb' => 'application/vnd.oasis.opendocument.database',
+    'odc' => 'application/vnd.oasis.opendocument.chart',
+    'odf' => 'application/vnd.oasis.opendocument.formula',
+    'odg' => 'application/vnd.oasis.opendocument.graphics',
+    'odi' => 'application/vnd.oasis.opendocument.image',
+    'odm' => 'application/vnd.oasis.opendocument.text-master',
+    'odp' => 'application/vnd.oasis.opendocument.presentation',
+    'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+    'odt' => 'application/vnd.oasis.opendocument.text',
+    'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+    'oth' => 'application/vnd.oasis.opendocument.text-web',
+    'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+    'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+    'ott' => 'application/vnd.oasis.opendocument.text-template',
     // staroffice:
-    'stc'     => 'application/vnd.sun.xml.calc.template',
-    'std'     => 'application/vnd.sun.xml.draw.template',
-    'sti'     => 'application/vnd.sun.xml.impress.template',
-    'stw'     => 'application/vnd.sun.xml.writer.template',
-    'sxc'     => 'application/vnd.sun.xml.calc',
-    'sxd'     => 'application/vnd.sun.xml.draw',
-    'sxg'     => 'application/vnd.sun.xml.writer.global',
-    'sxi'     => 'application/vnd.sun.xml.impress',
-    'sxm'     => 'application/vnd.sun.xml.math',
-    'sxw'     => 'application/vnd.sun.xml.writer',
+    'stc' => 'application/vnd.sun.xml.calc.template',
+    'std' => 'application/vnd.sun.xml.draw.template',
+    'sti' => 'application/vnd.sun.xml.impress.template',
+    'stw' => 'application/vnd.sun.xml.writer.template',
+    'sxc' => 'application/vnd.sun.xml.calc',
+    'sxd' => 'application/vnd.sun.xml.draw',
+    'sxg' => 'application/vnd.sun.xml.writer.global',
+    'sxi' => 'application/vnd.sun.xml.impress',
+    'sxm' => 'application/vnd.sun.xml.math',
+    'sxw' => 'application/vnd.sun.xml.writer',
     // k-office:
-    'kil'     => 'application/x-killustrator',
-    'kpt'     => 'application/x-kpresenter',
-    'kpr'     => 'application/x-kpresenter',
-    'ksp'     => 'application/x-kspread',
-    'kwt'     => 'application/x-kword',
-    'kwd'     => 'application/x-kword',
+    'kil' => 'application/x-killustrator',
+    'kpt' => 'application/x-kpresenter',
+    'kpr' => 'application/x-kpresenter',
+    'ksp' => 'application/x-kspread',
+    'kwt' => 'application/x-kword',
+    'kwd' => 'application/x-kword',
     // ms office 97:
-    'doc'     => 'application/msword',
-    'xls'     => 'application/vnd.ms-excel',
-    'ppt'     => 'application/vnd.ms-powerpoint',
+    'doc' => 'application/msword',
+    'xls' => 'application/vnd.ms-excel',
+    'ppt' => 'application/vnd.ms-powerpoint',
     // office2007:
-    'docx'    => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    'docm'    => 'application/vnd.ms-word.document.macroEnabled.12',
-    'dotx'    => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-    'dotm'    => 'application/vnd.ms-word.template.macroEnabled.12',
-    'xlsx'    => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    'xlsm'    => 'application/vnd.ms-excel.sheet.macroEnabled.12',
-    'xltx'    => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-    'xltm'    => 'application/vnd.ms-excel.template.macroEnabled.12',
-    'xlsb'    => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-    'xlam'    => 'application/vnd.ms-excel.addin.macroEnabled.12',
-    'pptx'    => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-    'pptm'    => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-    'ppsx'    => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-    'ppsm'    => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
-    'potx'    => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-    'potm'    => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
-    'ppam'    => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
-    'sldx'    => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-    'sldm'    => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
+    'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
+    'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+    'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+    'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+    'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+    'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+    'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+    'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+    'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+    'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+    'sldm' => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
     // wordperfect (who cares?):
-    'wpd'     => 'application/wordperfect',
+    'wpd' => 'application/wordperfect',
     // common and generic containers:
-    'pdf'     => 'application/pdf',
-    'eps'     => 'application/postscript',
-    'ps'      => 'application/postscript',
-    'rtf'     => 'text/rtf',
-    'rtx'     => 'text/richtext',
-    'latex'   => 'application/x-latex',
-    'tex'     => 'application/x-tex',
-    'texi'    => 'application/x-texinfo',
+    'pdf' => 'application/pdf',
+    'eps' => 'application/postscript',
+    'ps' => 'application/postscript',
+    'rtf' => 'text/rtf',
+    'rtx' => 'text/richtext',
+    'latex' => 'application/x-latex',
+    'tex' => 'application/x-tex',
+    'texi' => 'application/x-texinfo',
     'texinfo' => 'application/x-texinfo',
     // *ml:
-    'css'     => 'text/css',
-    'htm'     => 'text/html',
-    'html'    => 'text/html',
-    'wbxml'   => 'application/vnd.wap.wbxml',
-    'xht'     => 'application/xhtml+xml',
-    'xhtml'   => 'application/xhtml+xml',
-    'xsl'     => 'text/xml',
-    'xml'     => 'text/xml',
-    'csv'     => 'text/csv',
-    'tsv'     => 'text/tab-separated-values',
-    'txt'     => 'text/plain',
+    'css' => 'text/css',
+    'htm' => 'text/html',
+    'html' => 'text/html',
+    'wbxml' => 'application/vnd.wap.wbxml',
+    'xht' => 'application/xhtml+xml',
+    'xhtml' => 'application/xhtml+xml',
+    'xsl' => 'text/xml',
+    'xml' => 'text/xml',
+    'csv' => 'text/csv',
+    'tsv' => 'text/tab-separated-values',
+    'txt' => 'text/plain',
     // images:
-    "bmp"     => "image/bmp",
-    "gif"     => "image/gif",
-    "ief"     => "image/ief",
-    "jpeg"    => "image/jpeg",
-    "jpe"     => "image/jpeg",
-    "jpg"     => "image/jpeg",
-    "jp2"     => "image/jp2",
-    "png"     => "image/png",
-    "tiff"    => "image/tiff",
-    "tif"     => "image/tif",
-    "djvu"    => "image/vnd.djvu",
-    "djv"     => "image/vnd.djvu",
-    "wbmp"    => "image/vnd.wap.wbmp",
-    "ras"     => "image/x-cmu-raster",
-    "pnm"     => "image/x-portable-anymap",
-    "pbm"     => "image/x-portable-bitmap",
-    "pgm"     => "image/x-portable-graymap",
-    "ppm"     => "image/x-portable-pixmap",
-    "rgb"     => "image/x-rgb",
-    "xbm"     => "image/x-xbitmap",
-    "xpm"     => "image/x-xpixmap",
-    "xwd"     => "image/x-windowdump",
+    "bmp" => "image/bmp",
+    "gif" => "image/gif",
+    "ief" => "image/ief",
+    "jpeg" => "image/jpeg",
+    "jpe" => "image/jpeg",
+    "jpg" => "image/jpeg",
+    "jp2" => "image/jp2",
+    "png" => "image/png",
+    "tiff" => "image/tiff",
+    "tif" => "image/tif",
+    "djvu" => "image/vnd.djvu",
+    "djv" => "image/vnd.djvu",
+    "wbmp" => "image/vnd.wap.wbmp",
+    "ras" => "image/x-cmu-raster",
+    "pnm" => "image/x-portable-anymap",
+    "pbm" => "image/x-portable-bitmap",
+    "pgm" => "image/x-portable-graymap",
+    "ppm" => "image/x-portable-pixmap",
+    "rgb" => "image/x-rgb",
+    "xbm" => "image/x-xbitmap",
+    "xpm" => "image/x-xpixmap",
+    "xwd" => "image/x-windowdump",
     // videos:
-    "mpeg"    => "video/mpeg",
-    "mpe"     => "video/mpeg",
-    "mpg"     => "video/mpeg",
-    "m4v"     => "video/mp4",
-    "mp4"     => "video/mp4",
-    "ogv"     => "video/ogg",
-    "qt"      => "video/quicktime",
-    "mov"     => "video/quicktime",
-    "mxu"     => "video/vnd.mpegurl",
-    "avi"     => "video/x-msvideo",
-    "movie"   => "video/x-sgi-movie",
-    "flv"     => "video/x-flv",
-    "swf"     => "application/x-shockwave-flash",
+    "mpeg" => "video/mpeg",
+    "mpe" => "video/mpeg",
+    "mpg" => "video/mpeg",
+    "m4v" => "video/mp4",
+    "mp4" => "video/mp4",
+    "ogv" => "video/ogg",
+    "qt" => "video/quicktime",
+    "mov" => "video/quicktime",
+    "mxu" => "video/vnd.mpegurl",
+    "avi" => "video/x-msvideo",
+    "movie" => "video/x-sgi-movie",
+    "flv" => "video/x-flv",
+    "swf" => "application/x-shockwave-flash",
     // audio:
-    "mp3"     => "audio/mpeg",
-    "mp4a"    => "audio/mp4",
-    "m4a"     => "audio/mp4",
-    "oga"     => "audio/ogg",
-    "ogg"     => "audio/ogg",
-    "flac"    => "audio/x-flac",
-    "wav"     => "audio/vnd.wave",
+    "mp3" => "audio/mpeg",
+    "mp4a" => "audio/mp4",
+    "m4a" => "audio/mp4",
+    "oga" => "audio/ogg",
+    "ogg" => "audio/ogg",
+    "flac" => "audio/x-flac",
+    "wav" => "audio/vnd.wave",
     // compressed formats: (note: http://svn.cleancode.org/svn/email/trunk/mime.types)
-    "tgz"     => "application/x-gzip",
-    "gz"      => "application/x-gzip",
-    "tar"     => "application/x-tar",
-    "gtar"    => "application/x-gtar",
-    "zip"     => "application/x-zip",
+    "tgz" => "application/x-gzip",
+    "gz" => "application/x-gzip",
+    "tar" => "application/x-tar",
+    "gtar" => "application/x-gtar",
+    "zip" => "application/x-zip",
     // others: 
-    'bin'     => 'application/octet-stream',
+    'bin' => 'application/octet-stream',
   );
-
   private $private_file_extensions;
   private $system_types;
   private $system_exts;
@@ -199,13 +199,12 @@ class MimeClass {
   public function __construct() {
 
     // populate the reverse shortlist:
-    $this->private_file_extensions = array_flip( $this->private_mime_types );
+    $this->private_file_extensions = array_flip($this->private_mime_types);
 
     // pick up a local mime.types file if it is available
-    if (is_readable('mime.types') ) {
+    if (is_readable('mime.types')) {
       $this->etc_mime_types = 'mime.types';
     }
-
   }
 
   /**
@@ -213,27 +212,27 @@ class MimeClass {
    * description: An alias to get_mimetype,
    * for backwards-compatibility with our old mimetype class.
    */
-  public function getType( $filename ) {
-    return $this->get_mimetype( $filename );
+  public function getType($filename) {
+    return $this->get_mimetype($filename);
   }
 
   /**
    * function: get_mimetype
    * description: returns a mimetype associated with the file extension of $filename
    */
-  public function get_mimetype( $filename, $debug = FALSE ) {
+  public function get_mimetype($filename, $debug = FALSE) {
 
-    $file_name_and_extension = explode( '.', $filename );
-    $ext = strtolower( array_pop( $file_name_and_extension ) );
+    $file_name_and_extension = explode('.', $filename);
+    $ext = strtolower(array_pop($file_name_and_extension));
 
-    if ( ! empty( $this->private_mime_types[$ext] ) ) {
-      if ( TRUE === $debug )
-        return array( 'mime_type' => $this->private_mime_types[$ext], 'method' => 'from_array' );
+    if (!empty($this->private_mime_types[$ext])) {
+      if (TRUE === $debug)
+        return array('mime_type' => $this->private_mime_types[$ext], 'method' => 'from_array');
       return $this->private_mime_types[$ext];
     }
 
     if (function_exists('file_get_mimetype')) {
-      $drupal_mimetype = file_get_mimetype( $filename );
+      $drupal_mimetype = file_get_mimetype($filename);
       if ('application/octet-stream' != $drupal_mimetype) {
         if (TRUE == $debug)
           return array('mime_type' => $drupal_mimetype, 'method' => 'file_get_mimetype');
@@ -241,42 +240,41 @@ class MimeClass {
       }
     }
 
-    if (!isset( $this->system_types))
+    if (!isset($this->system_types))
       $this->system_types = $this->system_extension_mime_types();
-    if (isset( $this->system_types[$ext])) {
+    if (isset($this->system_types[$ext])) {
       if (TRUE == $debug)
         return array('mime_type' => $this->system_types[$ext], 'method' => 'mime.types');
       return $this->system_types[$ext];
     }
 
-    if ( TRUE === $debug )
-      return array( 'mime_type' => 'application/octet-stream', 'method' => 'last_resort' );
+    if (TRUE === $debug)
+      return array('mime_type' => 'application/octet-stream', 'method' => 'last_resort');
     return 'application/octet-stream';
-
   }
 
   /**
    * function: get_extension
    * description: returns *one* valid file extension for a given $mime_type
    */
-  public function get_extension( $mime_type, $debug = FALSE ) {
+  public function get_extension($mime_type, $debug = FALSE) {
 
-    if (!empty( $this->private_file_extensions[$mime_type])) {
+    if (!empty($this->private_file_extensions[$mime_type])) {
       if (TRUE == $debug)
-        return array( 'extension' => $this->private_file_extensions[$mime_type], 'method' => 'from_array' );
+        return array('extension' => $this->private_file_extensions[$mime_type], 'method' => 'from_array');
       return $this->private_file_extensions[$mime_type];
     }
 
-    if (!isset ( $this->system_exts))
+    if (!isset($this->system_exts))
       $this->system_exts = $this->system_mime_type_extensions();
-    if (isset( $this->system_exts[$mime_type])) {
+    if (isset($this->system_exts[$mime_type])) {
       if (TRUE == $debug)
-        return array( 'extension' => $this->system_exts[$mime_type], 'method' => 'mime.types' );
+        return array('extension' => $this->system_exts[$mime_type], 'method' => 'mime.types');
       return $this->system_exts[$mime_type];
     }
 
     if (TRUE == $debug)
-      return array( 'extension' => 'bin', 'method' => 'last_resort' );
+      return array('extension' => 'bin', 'method' => 'last_resort');
     return 'bin';
   }
 
@@ -297,11 +295,11 @@ class MimeClass {
       $parts = preg_split('/\s+/', $line);
       if (count($parts) == 1)
         continue;
-        // A single part means a mimetype without extensions, which we ignore.
+      // A single part means a mimetype without extensions, which we ignore.
       $type = array_shift($parts);
       if (!isset($out[$type]))
         $out[$type] = array_shift($parts);
-        // We take the first ext from the line if many are present.
+      // We take the first ext from the line if many are present.
     }
     fclose($file);
     return $out;
@@ -324,7 +322,7 @@ class MimeClass {
       $parts = preg_split('/\s+/', $line);
       if (count($parts) == 1)
         continue;
-        // A single part means a mimetype without extensions, which we ignore.
+      // A single part means a mimetype without extensions, which we ignore.
       $type = array_shift($parts);
       foreach ($parts as $part)
         $out[$part] = $type;

ObjectHelper.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 /*
  * Created on Feb 1, 2008
@@ -85,7 +85,8 @@ class ObjectHelper {
       if ($label == NULL) {
         $label = $item->datastreams[$dsID]['label'];
       }
-    } else {
+    }
+    else {
       drupal_not_found();
       exit();
     }
@@ -95,7 +96,8 @@ class ObjectHelper {
       $fedoraUser = 'anonymous';
       $fedoraPass = 'anonymous';
       $contentSize = 0;
-    } else {
+    }
+    else {
       $fedoraUser = $user->name;
       $fedoraPass = $user->pass;
       $dataStreamInfo = $item->get_datastream_info($dsID);
@@ -135,7 +137,8 @@ class ObjectHelper {
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_exec($ch);
         fclose($fp);
-      } else {
+      }
+      else {
 
         header("Content-type: $mimeType");
         if ($contentSize > 0) {
@@ -168,12 +171,14 @@ class ObjectHelper {
 
         if ((isset($user) && $user->uid != 0) || $forceSoap || isset($_SERVER['HTTPS'])) {
           curl_exec($ch);
-        } else {
+        }
+        else {
           header('Location: ' . $url);
         }
       }
       curl_close($ch);
-    } else {
+    }
+    else {
       drupal_set_message(t('No curl support.'), 'error');
     }
   }
@@ -264,10 +269,11 @@ 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 {
+    }
+    else {
       $purgeImage = '&nbsp;';
     }
     $fullPath = base_path() . $path;
@@ -292,7 +298,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)) {
@@ -322,7 +328,6 @@ class ObjectHelper {
 
     if (empty($xmlstr)) {
       return '';
-
     }
 
     try {
@@ -374,14 +379,12 @@ 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;
   }
 
-
   /**
    * Gets a list of datastreams from an object using its pid
    *
@@ -466,8 +469,6 @@ class ObjectHelper {
     return '';
   }
 
-
-
   /**
    * returns a stream from a fedora object given a pid and dsid
    *
@@ -572,7 +573,8 @@ class ObjectHelper {
         return FALSE;
       }
       return $user_access;
-    } else {
+    }
+    else {
       return FALSE;
     }
   }
@@ -629,17 +631,17 @@ 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');
           }
         }
-      } else {
+      }
+      else {
         $ingestObject = '&nbsp;';
       }
-
     }
 
-      $datastreams .= $ingestObject;
+    $datastreams .= $ingestObject;
 
 
     $output .= $datastreams;
@@ -794,10 +796,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 ';
@@ -850,10 +852,11 @@ class ObjectHelper {
     module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
     // Before executing the query, we hve a base case of accessing the top-level collection
     global $base_url;
-    if ($pid == variable_get('fedora_repository_pid', 'islandora:top')){
-        $breadcrumbs[] = l(t('Digital repository'), 'fedora/repository');
-        $breadcrumbs[] = l(t('Home'), $base_url);
-    } else {
+    if ($pid == variable_get('fedora_repository_pid', 'islandora:top')) {
+      $breadcrumbs[] = l(t('Digital repository'), 'fedora/repository');
+      $breadcrumbs[] = l(t('Home'), $base_url);
+    }
+    else {
       $query_string = 'select $parentObject $title $content from <#ri>
                                where (<info:fedora/' . $pid . '> <dc:title> $title
                                and $parentObject <fedora-model:hasModel> $content
@@ -868,17 +871,18 @@ class ObjectHelper {
       $url = variable_get('fedora_repository_url', 'http://localhost:8080/fedora/risearch');
       $url .= "?type=tuples&flush=TRUE&format=CSV&limit=1&offset=0&lang=itql&stream=on&query=" . $query_string;
 
-      $result = preg_split('/[\r\n]+/',do_curl($url));
+      $result = preg_split('/[\r\n]+/', do_curl($url));
       array_shift($result); // throw away first line
-      $matches =str_getcsv(join("\n",$result));
+      $matches = str_getcsv(join("\n", $result));
       if ($matches !== FALSE) {
-        $parent = preg_replace('/^info:fedora\//','',$matches[0]);
+        $parent = preg_replace('/^info:fedora\//', '', $matches[0]);
 
         $breadcrumbs[] = l($matches[1], 'fedora/repository/' . $pid);
         if ($parent == variable_get('fedora_repository_pid', 'islandora:top')) {
           $breadcrumbs[] = l(t('Digital repository'), 'fedora/repository');
           $breadcrumbs[] = l(t('Home'), $base_url);
-        } elseif ($level > 0) {
+        }
+        elseif ($level > 0) {
           $this->getBreadcrumbs($parent, $breadcrumbs, $level - 1);
         }
       }

SearchClass.inc

@@ -1,16 +1,19 @@
 <?php
-// $Id$
+
+
 
 class SearchClass {
+
   public static $SEARCH_CLASS_ADVANCED_SEARCH_NUMBER_FIELDS = 5;
-  function solr_search($query,  $startPage=1, $fq = NULL, $dismax = NULL) {
+
+  function solr_search($query, $startPage=1, $fq = NULL, $dismax = NULL) {
     $solrFile = trim(variable_get('islandora_solr_search_block_handler_file', 'plugins/SolrResults.inc'));
     if (strpos($solrField, '../')) {  // Don't let us bust out of fedora_repository modules directory when looking for a handler
       drupal_set_message(t('You have illegal characters in your solr handler function in the Islandora solr block config.'), 'error');
     }
     $solrClass = trim(variable_get('islandora_solr_search_block_handler_class', 'SolrResults'));
     $solrFunction = trim(variable_get('islandora_solr_search_block_handler_function', 'SearchAndDisplay'));
-   require_once(drupal_get_path('module', 'fedora_repository') . '/'. $solrFile);
+    require_once(drupal_get_path('module', 'fedora_repository') . '/' . $solrFile);
     try {
       $implementation = new $solrClass();
     } catch (Exception $e) {
@@ -19,83 +22,84 @@ class SearchClass {
     }
     return $implementation->$solrFunction($query, $startPage, $fq, $dismax);
   }
+
   function build_solr_search_form($repeat = NULL, $pathToSearchTerms = NULL, $query = NULL) {
     $types = $this->get_search_terms_array(NULL, 'solrSearchTerms.xml');
-    $queryArray=NULL;
+    $queryArray = NULL;
     if (isset($query)) {
       $queryArray = explode('AND', $query);
     }
 
     $andOrArray = array(
-            'AND' => 'and',
-            //'OR' => 'or' //removed or for now as it would be a pain to parse
+      'AND' => 'and',
+      //'OR' => 'or' //removed or for now as it would be a pain to parse
     );
     $form = array();
 
     if (!isset($repeat)) {
-      $repeat = variable_get('islandora_solr_search_block_repeat',  t('3'));
+      $repeat = variable_get('islandora_solr_search_block_repeat', t('3'));
     }
     $var0 = explode(':', $queryArray[0]);
     $var1 = explode(':', $queryArray[1]);
     $form['search_type']['type1'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#options' => $types,
-            '#default_value' => trim($var0[0])
+      '#title' => t(''),
+      '#type' => 'select',
+      '#options' => $types,
+      '#default_value' => trim($var0[0])
     );
     $form['fedora_terms1'] = array(
-            '#size' => '24',
-            '#type' => 'textfield',
-            '#title' => t(''),
-            '#required' => TRUE,
-            '#default_value' => (count($var0) >= 2 ? trim($var0[1]) : ''),
+      '#size' => '24',
+      '#type' => 'textfield',
+      '#title' => t(''),
+      '#required' => TRUE,
+      '#default_value' => (count($var0) >= 2 ? trim($var0[1]) : ''),
     );
     $form['andor1'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#default_value' =>  'AND',
-            '#options' => $andOrArray
+      '#title' => t(''),
+      '#type' => 'select',
+      '#default_value' => 'AND',
+      '#options' => $andOrArray
     );
     $form['search_type']['type2'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#options' => $types,
-            '#default_value' => (count($var1) >= 2 ? trim($var1[0]) : ''),
+      '#title' => t(''),
+      '#type' => 'select',
+      '#options' => $types,
+      '#default_value' => (count($var1) >= 2 ? trim($var1[0]) : ''),
     );
     $form['fedora_terms2'] = array(
-            '#size' => '24',
-            '#type' => 'textfield',
-            '#title' => t(''),
-            '#default_value' => (count($var1) >= 2 ? $var1[1] : ''),
+      '#size' => '24',
+      '#type' => 'textfield',
+      '#title' => t(''),
+      '#default_value' => (count($var1) >= 2 ? $var1[1] : ''),
     );
-    if ($repeat>2 && $repeat < 9) { //don't want less then 2 or more then 9
+    if ($repeat > 2 && $repeat < 9) { //don't want less then 2 or more then 9
       for ($i = 3; $i < $repeat + 1; $i++) {
         $t = $i - 1;
         $field_and_term = explode(':', $queryArray[$t]);
         $form["andor$t"] = array(
-                '#title' => t(''),
-                '#type' => 'select',
-                '#default_value' => 'AND',
-                '#options' => $andOrArray
+          '#title' => t(''),
+          '#type' => 'select',
+          '#default_value' => 'AND',
+          '#options' => $andOrArray
         );
         $form['search_type']["type$i"] = array(
-                '#title' => t(''),
-                '#type' => 'select',
-                '#options' => $types,
-                '#default_value' => trim($field_and_term[0])
+          '#title' => t(''),
+          '#type' => 'select',
+          '#options' => $types,
+          '#default_value' => trim($field_and_term[0])
         );
         $form["fedora_terms$i"] = array(
-                '#size' => '24',
-                '#type' => 'textfield',
-                '#title' => t(''),
-                '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
+          '#size' => '24',
+          '#type' => 'textfield',
+          '#title' => t(''),
+          '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
         );
       }
     }
 
     $form['submit'] = array(
-            '#type' => 'submit',
-            '#value' => t('search')
+      '#type' => 'submit',
+      '#value' => t('search')
     );
     return $form;
   }
@@ -103,39 +107,39 @@ class SearchClass {
   function build_simple_solr_form() {
     //$form = array();
     $form["search_query"] = array(
-                '#size' => '30',
-                '#type' => 'textfield',
-                '#title' => t(''),
-               // '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
-        );
+      '#size' => '30',
+      '#type' => 'textfield',
+      '#title' => t(''),
+      // '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
+    );
     $form['submit'] = array(
-            '#type' => 'submit',
-            '#value' => t('search')
+      '#type' => 'submit',
+      '#value' => t('search')
     );
     return $form;
   }
+
   function theme_solr_search_form($form) {
     if (!isset($repeat)) {
-      $repeat = variable_get('islandora_solr_search_block_repeat',  t('3'));
+      $repeat = variable_get('islandora_solr_search_block_repeat', t('3'));
     }
 
-    $output = drupal_render($form['search_type']['type1']) ;
-    $output .= drupal_render($form['fedora_terms1']) ;
-    $output .=  drupal_render($form['andor1'])  . drupal_render($form['search_type']['type2']) ;
+    $output = drupal_render($form['search_type']['type1']);
+    $output .= drupal_render($form['fedora_terms1']);
+    $output .= drupal_render($form['andor1']) . drupal_render($form['search_type']['type2']);
     $output .= drupal_render($form['fedora_terms2']);
-    if ($repeat>2 && $repeat < 9) {
-      for ($i=3;$i<$repeat+1;$i++) {
+    if ($repeat > 2 && $repeat < 9) {
+      for ($i = 3; $i < $repeat + 1; $i++) {
         $t = $i - 1;
-        $output .=  drupal_render($form["andor$t"])  . drupal_render($form['search_type']["type$i"]) ;
-        $output .= drupal_render($form["fedora_terms$i"]) ;
+        $output .= drupal_render($form["andor$t"]) . drupal_render($form['search_type']["type$i"]);
+        $output .= drupal_render($form["fedora_terms$i"]);
       }
     }
-    $output .=  drupal_render($form['submit']) ;
+    $output .= drupal_render($form['submit']);
     $output .= drupal_render($form);
     return $output;
-
-
   }
+
   function quickSearch($type, $query, $showForm = 1, $orderBy = 0, & $userArray) {
     module_load_include('inc', 'fedora_repository', 'ObjectHelper');
     module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
@@ -146,15 +150,15 @@ class SearchClass {
       $keywords = explode(' ', $query);
 
       foreach ($keywords as $keyword) {
-        $luceneQuery .= $type . ':'. $keyword . '+AND+';
+        $luceneQuery .= $type . ':' . $keyword . '+AND+';
       }
       $luceneQuery = substr($luceneQuery, 0, strlen($luceneQuery) - 5);
 
       $indexName = variable_get('fedora_index_name', 'DemoOnLucene');
       $keys = htmlentities(urlencode($query));
       $searchUrl = variable_get('fedora_fgsearch_url', 'http://localhost:8080/fedoragsearch/rest');
-      $searchString = '?operation=gfindObjects&indexName='. $indexName . '&restXslt=copyXml&query='. $luceneQuery;
-      $searchString .= '&hitPageSize='. $numberOfHistPerPage . '&hitPageStart=1';
+      $searchString = '?operation=gfindObjects&indexName=' . $indexName . '&restXslt=copyXml&query=' . $luceneQuery;
+      $searchString .= '&hitPageSize=' . $numberOfHistPerPage . '&hitPageStart=1';
       //$searchString = htmlentities($searchString);
       $searchUrl .= $searchString;
 
@@ -169,19 +173,18 @@ class SearchClass {
         $nodeList = $xPath->query('//field[@name="refworks.u1"]');
         foreach ($nodeList as $node) {
           if (!in_array($node->nodeValue, $userArray)) {
-            $userArray[]=$node->nodeValue;
+            $userArray[] = $node->nodeValue;
           }
         }
       }
       if ($showForm) {
-        $output = '<Strong>Quick Search</strong><br /><table class="table-form"><tr>'. drupal_get_form('fedora_repository_quick_search_form') . '</tr></table>';
+        $output = '<Strong>Quick Search</strong><br /><table class="table-form"><tr>' . drupal_get_form('fedora_repository_quick_search_form') . '</tr></table>';
       }
       $output .= $this->applyXSLT($resultData, $orderBy);
       return $output;
     }
   }
 
-
   // gets term from a lucene index and displays them in a list
   function getTerms($fieldName, $startTerm, $displayName = NULL) {
     module_load_include('inc', 'fedora_repository', 'ObjectHelper');
@@ -192,10 +195,10 @@ class SearchClass {
       $startTerm = "";
     }
     $startTerm = drupal_urlencode($startTerm);
-    $query = 'operation=browseIndex&startTerm='. $startTerm . '&fieldName='. $fieldName . '&termPageSize=20&indexName='. $indexName . '&restXslt=copyXml&resultPageXslt=copyXml';
+    $query = 'operation=browseIndex&startTerm=' . $startTerm . '&fieldName=' . $fieldName . '&termPageSize=20&indexName=' . $indexName . '&restXslt=copyXml&resultPageXslt=copyXml';
     // $query=drupal_urlencode($query);
-    $query = '?'. $query;
-    $searchString=$searchUrl . $query;
+    $query = '?' . $query;
+    $searchString = $searchUrl . $query;
 
     $objectHelper = new ObjectHelper();
 
@@ -205,11 +208,8 @@ class SearchClass {
     $output .= $this->applySpecifiedXSLT($resultData, $path . '/xsl/browseIndexToResultPage.xslt', $displayName);
     //$output .= '<br />'.$alpha_out;
     return $output;
-
   }
 
-  
-
   function custom_search($query, $startPage=1, $xslt= '/xsl/advanced_search_results.xsl', $numberOfHistPerPage = 50) {
     module_load_include('inc', 'fedora_repository', 'ObjectHelper');
     module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
@@ -225,8 +225,8 @@ class SearchClass {
       $query = trim($query);
       $query = htmlentities(urlencode($query));
       $searchUrl = variable_get('fedora_fgsearch_url', 'http://localhost:8080/fedoragsearch/rest');
-      $searchString = '?operation=gfindObjects&indexName=' . $indexName . '&restXslt='. $copyXMLFile . '&query=' . $query;
-      $searchString .= '&hitPageSize='. $numberOfHistPerPage . '&hitPageStart='. $startPage;
+      $searchString = '?operation=gfindObjects&indexName=' . $indexName . '&restXslt=' . $copyXMLFile . '&query=' . $query;
+      $searchString .= '&hitPageSize=' . $numberOfHistPerPage . '&hitPageStart=' . $startPage;
       //$searchString = htmlentities($searchString);
       $searchUrl .= $searchString;
 
@@ -242,7 +242,6 @@ class SearchClass {
     }
   }
 
-
   function applySpecifiedXSLT($resultData, $pathToXSLT, $displayName = NULL) {
     $proc = NULL;
     global $user;
@@ -252,9 +251,8 @@ class SearchClass {
     }
     try {
       $proc = new XsltProcessor();
-    }
-    catch (Exception $e) {
-      drupal_set_message(t('Error loading '. $pathToXSLT . ' xslt!') . $e->getMessage());
+    } catch (Exception $e) {
+      drupal_set_message(t('Error loading ' . $pathToXSLT . ' xslt!') . $e->getMessage());
       return ' ';
     }
 
@@ -270,10 +268,10 @@ class SearchClass {
 
     $xsl = new DomDocument();
 
-    $test= $xsl->load($pathToXSLT);
+    $test = $xsl->load($pathToXSLT);
 
     if (!isset($test)) {
-      drupal_set_message(t('Error loading '. $pathToXSLT . ' xslt!'));
+      drupal_set_message(t('Error loading ' . $pathToXSLT . ' xslt!'));
       return t('Error loading !pathToXSLT xslt.', array('!pathToXSLT' => $pathToXSLT));
     }
 
@@ -291,8 +289,8 @@ class SearchClass {
       return $newdom->saveXML();
     }
   }
-  //default function for lucene results
 
+  //default function for lucene results
 
   /**
    * apply an xslt to lucene gsearch search results
@@ -305,8 +303,8 @@ class SearchClass {
   function applyLuceneXSLT($resultData, $startPage = 1, $xslt_file = '/xsl/results.xsl', $query=NULL) {
     $path = drupal_get_path('module', 'Fedora_Repository');
     $test = $xslt_file;
-    $isRestricted = variable_get('fedora_namespace_restriction_enforced',TRUE);
-    if(!isRestricted && $xslt_file == null){
+    $isRestricted = variable_get('fedora_namespace_restriction_enforced', TRUE);
+    if (!isRestricted && $xslt_file == NULL) {
       $xslt_file = '/xsl/unfilteredresults.xsl';
     }
     $proc = NULL;
@@ -378,7 +376,7 @@ class SearchClass {
     $proc->setParameter('', 'orderBy', $orderBy);
     $xsl = new DomDocument();
 
-    $test=$xsl->load($path . '/ir/xsl/results.xsl');
+    $test = $xsl->load($path . '/ir/xsl/results.xsl');
     if (!isset($test)) {
       drupal_set_message(t('Error loading search results xslt!'));
       return t('Error loading search results XSLT.');
@@ -400,21 +398,21 @@ class SearchClass {
 
   function theme_advanced_search_form($form, $repeat=NULL) {
     if (!isset($repeat)) {
-      $repeat = variable_get('fedora_repository_advanced_block_repeat',  t('3'));
+      $repeat = variable_get('fedora_repository_advanced_block_repeat', t('3'));
     }
 
-    $output = drupal_render($form['search_type']['type1']) ;
-    $output .= drupal_render($form['fedora_terms1']) ;
-    $output .=  drupal_render($form['andor1'])  . drupal_render($form['search_type']['type2']) ;
+    $output = drupal_render($form['search_type']['type1']);
+    $output .= drupal_render($form['fedora_terms1']);
+    $output .= drupal_render($form['andor1']) . drupal_render($form['search_type']['type2']);
     $output .= drupal_render($form['fedora_terms2']);
-    if ($repeat>2 && $repeat < 9) {
-      for ($i=3;$i<$repeat+1;$i++) {
+    if ($repeat > 2 && $repeat < 9) {
+      for ($i = 3; $i < $repeat + 1; $i++) {
         $t = $i - 1;
-        $output .=  drupal_render($form["andor$t"])  . drupal_render($form['search_type']["type$i"]) ;
-        $output .= drupal_render($form["fedora_terms$i"]) ;
+        $output .= drupal_render($form["andor$t"]) . drupal_render($form['search_type']["type$i"]);
+        $output .= drupal_render($form["fedora_terms$i"]);
       }
     }
-    $output .=  drupal_render($form['submit']) ;
+    $output .= drupal_render($form['submit']);
     $output .= drupal_render($form);
     return $output;
   }
@@ -422,86 +420,85 @@ class SearchClass {
   //build search form, custom blocks should set the number of repeats or it will use the default
   function build_advanced_search_form($repeat = NULL, $pathToSearchTerms = NULL, $query = NULL) {
     $types = $this->get_search_terms_array($pathToSearchTerms);
-    $queryArray=NULL;
+    $queryArray = NULL;
     if (isset($query)) {
       $queryArray = explode('AND', $query);
     }
 
     $andOrArray = array(
-            'AND' => 'and',
-            //'OR' => 'or' //removed or for now as it would be a pain to parse
+      'AND' => 'and',
+      //'OR' => 'or' //removed or for now as it would be a pain to parse
     );
     $form = array();
 
     if (!isset($repeat)) {
-      $repeat = variable_get('fedora_repository_advanced_block_repeat',  t('3'));
+      $repeat = variable_get('fedora_repository_advanced_block_repeat', t('3'));
     }
     $var0 = explode(':', $queryArray[0]);
     $var1 = explode(':', $queryArray[1]);
     $form['search_type']['type1'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#options' => $types,
-            '#default_value' => trim($var0[0])
+      '#title' => t(''),
+      '#type' => 'select',
+      '#options' => $types,
+      '#default_value' => trim($var0[0])
     );
     $form['fedora_terms1'] = array(
-            '#size' => '24',
-            '#type' => 'textfield',
-            '#title' => t(''),
-            '#required' => TRUE,
-            '#default_value' => (count($var0) >= 2 ? trim($var0[1]) : ''),
+      '#size' => '24',
+      '#type' => 'textfield',
+      '#title' => t(''),
+      '#required' => TRUE,
+      '#default_value' => (count($var0) >= 2 ? trim($var0[1]) : ''),
     );
     $form['andor1'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#default_value' =>  'AND',
-            '#options' => $andOrArray
+      '#title' => t(''),
+      '#type' => 'select',
+      '#default_value' => 'AND',
+      '#options' => $andOrArray
     );
     $form['search_type']['type2'] = array(
-            '#title' => t(''),
-            '#type' => 'select',
-            '#options' => $types,
-            '#default_value' => (count($var1) >= 2 ? trim($var1[0]) : ''),
+      '#title' => t(''),
+      '#type' => 'select',
+      '#options' => $types,
+      '#default_value' => (count($var1) >= 2 ? trim($var1[0]) : ''),
     );
     $form['fedora_terms2'] = array(
-            '#size' => '24',
-            '#type' => 'textfield',
-            '#title' => t(''),
-            '#default_value' => (count($var1) >= 2 ? $var1[1] : ''),
+      '#size' => '24',
+      '#type' => 'textfield',
+      '#title' => t(''),
+      '#default_value' => (count($var1) >= 2 ? $var1[1] : ''),
     );
-    if ($repeat>2 && $repeat < 9) { //don't want less then 2 or more then 9
+    if ($repeat > 2 && $repeat < 9) { //don't want less then 2 or more then 9
       for ($i = 3; $i < $repeat + 1; $i++) {
         $t = $i - 1;
         $field_and_term = explode(':', $queryArray[$t]);
         $form["andor$t"] = array(
-                '#title' => t(''),
-                '#type' => 'select',
-                '#default_value' => 'AND',
-                '#options' => $andOrArray
+          '#title' => t(''),
+          '#type' => 'select',
+          '#default_value' => 'AND',
+          '#options' => $andOrArray
         );
         $form['search_type']["type$i"] = array(
-                '#title' => t(''),
-                '#type' => 'select',
-                '#options' => $types,
-                '#default_value' => trim($field_and_term[0])
+          '#title' => t(''),
+          '#type' => 'select',
+          '#options' => $types,
+          '#default_value' => trim($field_and_term[0])
         );
         $form["fedora_terms$i"] = array(
-                '#size' => '24',
-                '#type' => 'textfield',
-                '#title' => t(''),
-                '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
+          '#size' => '24',
+          '#type' => 'textfield',
+          '#title' => t(''),
+          '#default_value' => (count($field_and_term) >= 2 ? trim($field_and_term[1]) : ''),
         );
       }
     }
 
     $form['submit'] = array(
-            '#type' => 'submit',
-            '#value' => t('search')
+      '#type' => 'submit',
+      '#value' => t('search')
     );
     return $form;
   }
 
-
   function get_search_terms_array($path = NULL, $file = NULL) {
     if (!isset($path)) {
       $path = drupal_get_path('module', 'Fedora_Repository');
@@ -510,7 +507,7 @@ class SearchClass {
     if (!isset($file)) {
       $file = 'searchTerms.xml';
     }
-    $xmlDoc->load($path . '/'. $file);
+    $xmlDoc->load($path . '/' . $file);
     $nodeList = $xmlDoc->getElementsByTagName('term');
     $types = array();
     for ($i = 0; $i < $nodeList->length; $i++) {
@@ -522,4 +519,5 @@ class SearchClass {
     }
     return $types;
   }
+
 }

SecurityClass.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * Created on 22-Oct-08
@@ -9,7 +10,9 @@
  */
 
 class SecurityClass {
+
   public static $SECURITY_CLASS_SECURITY_STREAM = 'POLICY';
+
   function SecurityClass() {
     module_load_include('inc', 'SecurityClass', '');
     drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
@@ -54,8 +57,7 @@ class SecurityClass {
     $usersAndRoles = array();
     try {
       $xml = new SimpleXMLElement($policyStream);
-    } 
-    catch (Exception $e) {
+    } 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');
@@ -68,7 +70,7 @@ class SecurityClass {
     foreach ($conditions as $condition) {
       $designator = $condition->Apply->SubjectAttributeDesignator;
       if (empty($designator)) {//$disignator may be wrapped by an or
-        $designator=$condition->Apply->Apply->SubjectAttributeDesignator;
+        $designator = $condition->Apply->Apply->SubjectAttributeDesignator;
       }
       $attributeId = strip_tags($designator['AttributeId']);
 
@@ -92,8 +94,8 @@ class SecurityClass {
     $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.
@@ -101,8 +103,7 @@ class SecurityClass {
     $doc = new DOMDocument();
     try {
       $doc->load(drupal_get_path('module', 'Fedora_Repository') . '/policies/noObjectEditPolicy.xml');
-    }
-    catch (exception $e) {
+    } catch (exception $e) {
       watchdog(t("Fedora_Repository"), t("Problem loading policy file."), NULL, WATCHDOG_ERROR);
     }
     $conditions = $doc->getElementsByTagName('Condition');
@@ -117,7 +118,7 @@ class SecurityClass {
             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 = $doc->createElement('AttributeValue', '<![CDATA[' . $role . ']]>');
                   $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
                   // $newAttributeValue->setAttribute('MustBePresent', 'FALSE');
                   $apply->appendChild($newAttributeValue);
@@ -132,7 +133,7 @@ class SecurityClass {
           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 = $doc->createElement('AttributeValue', $user->name);
               $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
               //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
               $apply->appendChild($newAttributeValue);
@@ -145,7 +146,7 @@ class SecurityClass {
     return $doc; //NULL; //$xml;
   }
 
- /**
+  /**
    * Add a list of allowed users and roles to the given policy stream and return it.
    *
    * @param string $policy_stream
@@ -170,7 +171,7 @@ class SecurityClass {
             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 = $dom->createElement('AttributeValue', $role);
                   $newAttributeValue->setAttribute('DataType', 'http://www.w3.org/2001/XMLSchema#string');
                   //$newAttributeValue->setAttribute('MustBePresent', 'FALSE');
                   $apply->appendChild($newAttributeValue);
@@ -186,8 +187,8 @@ class SecurityClass {
           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 );
+              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);
@@ -200,4 +201,5 @@ class SecurityClass {
     // $this->collection_policy_stream = $dom->saveXML();
     return $dom->saveXML();
   }
+
 }

XMLDatastream.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 abstract class XMLDatastream {
 
@@ -96,7 +96,7 @@ abstract class XMLDatastream {
     $this->pid = $pid;
     $this->dsid = $dsid;
     if ($xmlStr !== NULL) {
-      if(is_object($xmlStr) && get_class($xmlStr) == DOMDocument) {
+      if (is_object($xmlStr) && get_class($xmlStr) == DOMDocument) {
         $this->xml = $xmlStr;
       }
       else {
@@ -180,7 +180,8 @@ abstract class XMLDatastream {
         // a subclass.
         $vars = get_class_vars(get_class($this));
         $schemaLocation = $vars['SCHEMA_URI'];
-      } elseif ($rootEl->attributes->getNamedItem('schemaLocation') !== NULL) {
+      }
+      elseif ($rootEl->attributes->getNamedItem('schemaLocation') !== NULL) {
         //figure out where the schema is located and validate.
         list(, $schemaLocation) = preg_split('/\s+/', $rootEl->attributes->getNamedItem('schemaLocation')->nodeValue);
       }
@@ -193,10 +194,12 @@ abstract class XMLDatastream {
           foreach ($errors as $err) {
             self::$errors[] = 'XML Error: Line ' . $err->line . ': ' . $err->message;
           }
-        } else {
+        }
+        else {
           $this->name = $rootEl->attributes->getNamedItem('name')->nodeValue;
         }
-      } else {
+      }
+      else {
         $ret = FALSE;
         self::$errors[] = 'Unable to load schema.';
       }

api/dublin_core.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * Implements a simple class for working with Dublin Core data and exporting it
@@ -8,6 +9,7 @@
  */
 
 class Dublin_Core {
+
   public $dc = array(
     'dc:title' => array(),
     'dc:creator' => array(),
@@ -45,17 +47,17 @@ class Dublin_Core {
    * @param <type> $element_name
    * @param <type> $value
    */
-  function add_element( $element_name, $value ) {
+  function add_element($element_name, $value) {
     if (is_string($value) && is_array($this->dc[$element_name])) {
       $this->dc[$element_name][] = $value;
     }
   }
 
-/**
- * Replace the given DC element with the values in $values
- * @param string $elemnt_name
- * @param array $values 
- */
+  /**
+   * Replace the given DC element with the values in $values
+   * @param string $elemnt_name
+   * @param array $values
+   */
   function set_element($element_name, $values) {
     if (is_array($values)) {
       $this->dc[$element_name] = $values;
@@ -68,7 +70,7 @@ class Dublin_Core {
   /**
    * Serialize this object to XML and return it.
    */
-  function as_xml( $with_preamble = FALSE ) {
+  function as_xml($with_preamble = FALSE) {
     $dc_xml = new DomDocument();
     $oai_dc = $dc_xml->createElementNS('http://www.openarchives.org/OAI/2.0/oai_dc/', 'oai_dc:dc');
     $oai_dc->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');

api/fedora_collection.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * Operations that affect a Fedora repository at a collection level.
@@ -15,7 +16,7 @@ module_load_include('module', 'fedora_repository');
  * that will let you import them into another repository.
  * @param <type> $format
  */
-function export_collection($collection_pid, $relationship = 'isMemberOfCollection', $format = 'info:fedora/fedora-system:FOXML-1.1' ) {
+function export_collection($collection_pid, $relationship = 'isMemberOfCollection', $format = 'info:fedora/fedora-system:FOXML-1.1') {
   $collection_item = new Fedora_Item($collection_pid);
   $foxml = $collection_item->export_as_foxml();
 
@@ -25,15 +26,15 @@ function export_collection($collection_pid, $relationship = 'isMemberOfCollectio
   $container = tempnam($file_dir, 'export_');
   file_delete($container);
   print $container;
-  if (mkdir($container) && mkdir($container . '/'. $collection_pid)) {
-    $foxml_dir = $container . '/'. $collection_pid;
-    $file = fopen($foxml_dir . '/'. $collection_pid . '.xml', 'w');
+  if (mkdir($container) && mkdir($container . '/' . $collection_pid)) {
+    $foxml_dir = $container . '/' . $collection_pid;
+    $file = fopen($foxml_dir . '/' . $collection_pid . '.xml', 'w');
     fwrite($file, $foxml);
     fclose($file);
 
     $member_pids = get_related_items_as_array($collection_pid, $relationship);
     foreach ($member_pids as $member) {
-      $file = fopen($foxml_dir . '/'. $member . '.xml', 'w');
+      $file = fopen($foxml_dir . '/' . $member . '.xml', 'w');
       $item = new Fedora_Item($member);
       $item_foxml = $item->export_as_foxml();
       fwrite($file, $item_foxml);
@@ -41,13 +42,13 @@ function export_collection($collection_pid, $relationship = 'isMemberOfCollectio
     }
     if (system("cd $container;zip -r $collection_pid.zip $collection_pid/* >/dev/NULL") == 0) {
       header("Content-type: application/zip");
-      header('Content-Disposition: attachment; filename="' . $collection_pid . '.zip'. '"');
-      $fh = fopen($container . '/'. $collection_pid . '.zip', 'r');
-      $the_data = fread($fh, filesize($container . '/'. $collection_pid . '.zip'));
+      header('Content-Disposition: attachment; filename="' . $collection_pid . '.zip' . '"');
+      $fh = fopen($container . '/' . $collection_pid . '.zip', 'r');
+      $the_data = fread($fh, filesize($container . '/' . $collection_pid . '.zip'));
       fclose($fh);
       echo $the_data;
     }
-    if (file_exists($container . '/'. $collection_pid)) {
+    if (file_exists($container . '/' . $collection_pid)) {
       system("rm -rf $container"); // I'm sorry.
     }
   }
@@ -82,21 +83,21 @@ function get_related_items_as_xml($collection_pid, $relationship = array('isMemb
 
   if (is_array($relationship)) {
     foreach ($relationship as $rel) {
-      $query_string .= '$object <fedora-rels-ext:'. $rel . '> <info:fedora/'. $collection_pid . '>';
+      $query_string .= '$object <fedora-rels-ext:' . $rel . '> <info:fedora/' . $collection_pid . '>';
       if (next($relationship)) {
         $query_string .= ' OR ';
       }
     }
   }
   elseif (is_string($relationship)) {
-    $query_string .= '$object <fedora-rels-ext:'. $relationship . '> <info:fedora/'. $collection_pid . '>';
+    $query_string .= '$object <fedora-rels-ext:' . $relationship . '> <info:fedora/' . $collection_pid . '>';
   }
   else {
     return '';
   }
 
   $query_string .= ') ';
-  $query_string .=  $active_objects_only ? 'and $object <fedora-model:state> <info:fedora/fedora-system:def/model#Active>' : '';
+  $query_string .= $active_objects_only ? 'and $object <fedora-model:state> <info:fedora/fedora-system:def/model#Active>' : '';
 
   if ($cmodel) {
     $query_string .= ' and $content <mulgara:is> <info:fedora/' . $cmodel . '>';
@@ -104,14 +105,14 @@ function get_related_items_as_xml($collection_pid, $relationship = array('isMemb
 
   $query_string .= ')
                     minus $content <mulgara:is> <info:fedora/fedora-system:FedoraObject-3.0>
-                    order by '.$orderby;
+                    order by ' . $orderby;
 
   $query_string = htmlentities(urlencode($query_string));
 
 
   $content = '';
   $url = variable_get('fedora_repository_url', 'http://localhost:8080/fedora/risearch');
-  $url .= "?type=tuples&flush=TRUE&format=Sparql&limit=$limit&offset=$offset&lang=itql&stream=on&query=". $query_string;
+  $url .= "?type=tuples&flush=TRUE&format=Sparql&limit=$limit&offset=$offset&lang=itql&stream=on&query=" . $query_string;
   $content .= do_curl($url);
 
   return $content;

api/fedora_export.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 define('FOXML_10', 'info:fedora/fedora-system:FOXML-1.0');
 define('FOXML_11', 'info:fedora/fedora-system:FOXML-1.1');
@@ -38,7 +38,7 @@ function export_objects_for_pid($pid, $dir, &$log) {
   $paths = array();
   foreach ($object->datastreamDef as $ds) {
     if (!in_array($ds->ID, $ignore_dsids)) {
-      $file = $dir .'/'. $ds->label .'.'. get_file_extension($ds->MIMEType);
+      $file = $dir . '/' . $ds->label . '.' . get_file_extension($ds->MIMEType);
       $paths[$ds->ID] = $file;
 
       //$content = $ob_helper->getDatastreamDissemination($pid, $ds->ID);
@@ -136,29 +136,29 @@ function export_foxml_for_pid($pid, $dir, $paths, &$log, $format = FOXML_11, $re
           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 ($dsNode->getElementsByTagName('METS:file') as $contentNode) {
+          /*
+            foreach ($dsNode->getElementsByTagName('METS:file') as $contentNode) {
             // Don't update datastreams having external uris
             if (in_array($dsNode->getAttribute('OWNERID'), $disallowed_groups)) {
-              continue;
+            continue;
             }
 
             foreach ($xpath->('METS:FLocat[@xlink:href]', $contentNode) as $Floc) {
-              $Floc->setAttribute('xlink:href', url($paths[$dsId], array('absolute' => true)));
+            $Floc->setAttribute('xlink:href', url($paths[$dsId], array('absolute' => true)));
             }
-          `}
-*/  
+            `}
+           */
         }
 
         break;
 
       default:
-        $log[] = log_line(t("Unknown or invalid format: ". $format), 'error');
+        $log[] = log_line(t("Unknown or invalid format: " . $format), 'error');
         return FALSE;
     }
   } //if $remove_islandora
 
-  $file = $dir .'/'. $pid .'.xml';
+  $file = $dir . '/' . $pid . '.xml';
   if (!$foxml->save($file)) {
     $log[] = log_line(t("Failed to write datastream %dsid for pid %pid to %file", array('%dsid' => $ds->ID, '%pid' => $pid, '%file' => $file)), 'error');
     return FALSE;

api/fedora_item.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 define('RELS_EXT_URI', 'info:fedora/fedora-system:def/relations-external#');
 define("FEDORA_MODEL_URI", 'info:fedora/fedora-system:def/model#');
@@ -55,7 +55,7 @@ class Fedora_Item {
     return (!empty($this->objectProfile));
   }
 
-  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.
@@ -76,7 +76,7 @@ class Fedora_Item {
     return $return_value;
   }
 
-  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;
     }
@@ -94,15 +94,14 @@ 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
     );
 
 
-    return $this->soap_call( 'addDataStream', $params );
-
+    return $this->soap_call('addDataStream', $params);
   }
 
-  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');
@@ -265,7 +264,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) {
@@ -332,7 +331,7 @@ class Fedora_Item {
     return $ret;
   }
 
-  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,
@@ -512,7 +511,7 @@ 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) {
@@ -612,7 +611,7 @@ class Fedora_Item {
     closedir($dir_handle);
   }
 
-  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,

api/fedora_utils.inc

@@ -1,35 +1,36 @@
 <?php
-// $Id$
+
 
 // @file fedora_utils.inc
 // Base utilities used by the Islansora fedora module.
 
 /*
-* Functions that emulate php5.3 functionality for backwards compatiablity
-*/
+ * Functions that emulate php5.3 functionality for backwards compatiablity
+ */
 if (!function_exists('str_getcsv')) {
-  function str_getcsv($input, $delimiter=',', $enclosure='"', $escape=null, $eol=null) { 
-    $temp=fopen("php://memory", "rw");
+
+  function str_getcsv($input, $delimiter=',', $enclosure='"', $escape=NULL, $eol=NULL) {
+    $temp = fopen("php://memory", "rw");
     fwrite($temp, $input);
     fseek($temp, 0);
-    $r=fgetcsv($temp, 4096, $delimiter, $enclosure);
+    $r = fgetcsv($temp, 4096, $delimiter, $enclosure);
     fclose($temp);
     return $r;
   }
+
 }
 /*
-* Functions that emulate php5.3 functionality for backwards compatiablity
-*/
+ * Functions that emulate php5.3 functionality for backwards compatiablity
+ */
 
 /*
  * Static functions used by the Fedora PHP API.
  */
 
-
 function do_curl($url, $return_to_variable = 1, $number_of_post_vars = 0, $post = NULL) {
   global $user;
   // Check if we are inside Drupal and there is a valid user.
-  if ((!isset ($user)) || $user->uid == 0) {
+  if ((!isset($user)) || $user->uid == 0) {
     $fedora_user = 'anonymous';
     $fedora_pass = 'anonymous';
   }
@@ -51,7 +52,7 @@ function do_curl($url, $return_to_variable = 1, $number_of_post_vars = 0, $post
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_USERPWD, "$fedora_user:$fedora_pass");
     //curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-    if ($number_of_post_vars>0&&$post) {
+    if ($number_of_post_vars > 0 && $post) {
       curl_setopt($ch, CURLOPT_POST, $number_of_post_vars);
       curl_setopt($ch, CURLOPT_POSTFIELDS, "$post");
     }
@@ -67,19 +68,17 @@ function do_curl($url, $return_to_variable = 1, $number_of_post_vars = 0, $post
 
 function fedora_available() {
 
-  $response = do_curl(variable_get('fedora_base_url', 'http://localhost:8080/fedora').'/describe');
+  $response = do_curl(variable_get('fedora_base_url', 'http://localhost:8080/fedora') . '/describe');
   return strstr($response, 'Repository Information HTML Presentation') !== FALSE;
-
 }
 
-
 /**
  * Returns a UTF-8-encoded transcripiton of the string given in $in_str.
  * @param string $in_str
  * @return string A UTF-8 encoded string.
  */
 function fix_encoding($in_str) {
-  $cur_encoding = mb_detect_encoding($in_str) ;
+  $cur_encoding = mb_detect_encoding($in_str);
   if ($cur_encoding == "UTF-8" && mb_check_encoding($in_str, "UTF-8")) {
     return $in_str;
   }
@@ -113,16 +112,15 @@ function fixDsid($dsid) {
   $replace = '';
   $new_dsid = preg_replace($find, $replace, $new_dsid);
 
-  if( strlen($new_dsid) > 63 )
+  if (strlen($new_dsid) > 63)
     $new_dsid = substr($new_dsid, -63);
 
-  if( preg_match('/^[^a-zA-Z]/', $dsid ) )
+  if (preg_match('/^[^a-zA-Z]/', $dsid))
     $new_dsid = 'x' . $new_dsid;
 
-  if( strlen($new_dsid) == 0 )
+  if (strlen($new_dsid) == 0)
     $new_dsid = 'item' . rand(1, 100);
 
   return $new_dsid;
-
 }
 

api/rels-ext.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * To change this template, choose Tools | Templates
@@ -12,32 +13,34 @@
  * @author aoneill
  */
 class RelsExt {
-    // Instance variables
-    public $relsExtArray = array(); 
-    private $originalRelsExtArray = array(); // Used to determine the result of modified() funciton.
-    // Member functions
-
-    /**
-     * Constructor that builds itself by retrieving the RELS-EXT stream from
-     * the repository for the given Fedora_Item.
-     * @param Fedora_Item $item
-     */
-    function RelsExt( $item ) {
-      $relsextxml = $item->get_datastream_dissemination('RELS-EXT');
-
-    }
-
-    function modified() {
-      return !(empty(array_diff($this->relsExtArray, $this->originalRelsExtArray)) &&
-               empty(array_diff($this->originalRelsExtArray, $this->relsExtArray)));
-    }
-
-    /**
-     * Save the current state of the RELS-EXT array out to the repository item
-     * as a datastream.
-     */
-    function save() {
-
-    }
+
+  // Instance variables
+  public $relsExtArray = array();
+  private $originalRelsExtArray = array(); // Used to determine the result of modified() funciton.
+
+  // Member functions
+
+  /**
+   * Constructor that builds itself by retrieving the RELS-EXT stream from
+   * the repository for the given Fedora_Item.
+   * @param Fedora_Item $item
+   */
+  function RelsExt($item) {
+    $relsextxml = $item->get_datastream_dissemination('RELS-EXT');
+  }
+
+  function modified() {
+    return!(empty(array_diff($this->relsExtArray, $this->originalRelsExtArray)) &&
+    empty(array_diff($this->originalRelsExtArray, $this->relsExtArray)));
+  }
+
+  /**
+   * Save the current state of the RELS-EXT array out to the repository item
+   * as a datastream.
+   */
+  function save() {
+    
+  }
+
 }
 

api/tagging.inc

@@ -1,5 +1,6 @@
 <?php
-// $Id$
+
+
 
 /*
  * @file tagging.inc
@@ -11,6 +12,7 @@
  * @author aoneill
  */
 class TagSet {
+
   public $tags = array();
   public $item = NULL;
   public $tagsDSID = 'TAGS';
@@ -23,7 +25,7 @@ class TagSet {
   }
 
   function load() {
-    $tagsxml = isset($this->item->datastreams[$this->tagsDSID])? $this->item->get_datastream_dissemination($this->tagsDSID) : NULL;
+    $tagsxml = isset($this->item->datastreams[$this->tagsDSID]) ? $this->item->get_datastream_dissemination($this->tagsDSID) : NULL;
     if (empty($tagsxml)) {
       $this->tags = array();
       return FALSE;
@@ -59,11 +61,11 @@ class TagSet {
       else {
         $this->item->modify_datastream_by_value($tagdoc->saveXML(), $this->tagsDSID, 'Tags', 'text/xml', 'X');
       }
-    } 
-    catch (exception $e) {
+    } catch (exception $e) {
       drupal_set_message('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>

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/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 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 anotherCoverFlow = new YAHOO.ext.CoverFlow('anotherCoverFlowTest', {height: 150, width: 500, images: otherImages, bgColor: '#C0C0C0'});
+    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 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'
+});
 
 
 

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

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 /*
  * Created on Aug 10, 2007
@@ -22,8 +22,6 @@ function fedora_repository_admin() {
   return $adminForm->createAdminForm();
 }
 
-
-
 /**
  * drupal hook
  * calls the fedora_repositorys_admin form
@@ -56,9 +54,9 @@ function fedora_repository_purge_object($pid = NULL, $name = NULL) {
     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)
+      array(
+        '%name' => $name,
+        '%pid' => $pid)
   );
 
   $output .= drupal_get_form('fedora_repository_purge_object_form', $pid);
@@ -201,7 +199,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;
               }
@@ -368,9 +366,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);
@@ -395,8 +393,8 @@ function fedora_repository_purge_stream($pid = NULL, $dsId = NULL, $name = NULL)
   }
 
   $output = t('Are you sure you wish to purge this datastream %name<br />',
-          array(
-            '%name' => $name)
+      array(
+        '%name' => $name)
   );
   $output .= drupal_get_form('fedora_repository_purge_stream_form', $pid, $dsId);
   return $output;
@@ -527,8 +525,8 @@ function fedora_repository_replace_stream_form_submit($form, &$form_state) {
   $dsid = $form_state['values']['dsId'];
   $dsLabel = $form_state['values']['dsLabel'];
   // 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){
+  $indexOfDot = strrpos($dsLabel, '.'); //use strrpos to get the last dot
+  if ($indexOfDot !== FALSE) {
     $dsLabel = substr($dsLabel, 0, $indexOfDot);
     $dsLabel .= substr($file->filename, strrpos($file->filename, '.')); // Add the file extention to the end of the label.;
   }
@@ -550,7 +548,6 @@ function fedora_repository_replace_stream_form_submit($form, &$form_state) {
   $item->modify_datastream_by_reference($streamUrl, $dsid, $dsLabel, $dformat);
 
   $form_state['redirect'] = 'fedora/repository/' . $pid;
-
 }
 
 function fedora_repository_edit_qdc_page($pid = NULL, $dsId = NULL) {
@@ -727,7 +724,7 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
     return '';
   }
 
-  if ($pid &!validPid($pid)) {
+  if ($pid & !validPid($pid)) {
 
     drupal_set_message(t("Invalid PID!"), 'error');
     return ' ';
@@ -869,7 +866,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);
   }
 
@@ -1180,7 +1177,6 @@ function fedora_repository_theme() {
       'arguments' => array(
         'element' => NULL
       ),
-
       'fedora_repository_solution_packs_list' => array(
         'arguments' => array(
           'solution_packs' => NULL,
@@ -1263,10 +1259,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 {
@@ -1432,7 +1428,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) {
@@ -1454,16 +1450,15 @@ function fedora_repository_demo_objects_form_submit($form, &$form_state) {
   }
 }
 
-
 function fedora_repository_required_fedora_objects() {
   // array( 'path-to-foxml-file', 'pid', 'dsid', 'path-to-datastream-file', int dsversion, boolean required)
   $module_path = drupal_get_path('module', 'fedora_repository');
-  return array (
+  return array(
     'fedora_repository' => array(
       'module' => 'fedora_repository',
       'title' => 'Islandora Core',
-      'objects' => array (
-        array (
+      'objects' => array(
+        array(
           'pid' => 'islandora:collectionCModel',
           'label' => 'Islandora Collection Content Model',
           'dsid' => 'ISLANDORACM',
@@ -1471,7 +1466,7 @@ function fedora_repository_required_fedora_objects() {
           'dsversion' => 2,
           'cmodel' => 'fedora-system:ContentModel-3.0',
         ),
-        array (
+        array(
           'pid' => 'islandora:strict_pdf',
           'label' => 'Islandora strict PDF content model',
           'dsid' => 'ISLANDORACM',
@@ -1482,85 +1477,85 @@ function fedora_repository_required_fedora_objects() {
           'pid' => 'islandora:top',
           'label' => 'Islandora Top-level Collection',
           'cmodel' => 'islandora:collectionCModel',
-          'datastreams' => array (
-            array (
+          'datastreams' => array(
+            array(
               'dsid' => 'COLLECTION_POLICY',
               'datastream_file' => "$module_path/collection_policies/COLLECTION-COLLECTION POLICY.xml",
             ),
-            array (
+            array(
               'dsid' => 'TN',
               'datastream_file' => "$module_path/images/Gnome-emblem-photos.png",
               'mimetype' => 'image/png',
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'islandora:ContentModelCollection',
           'label' => 'Collection of installed content models',
           'cmodel' => 'islandora:collectionCModel',
           'parent' => 'islandora:top',
-          'datastreams' => array (
-            array (
+          'datastreams' => array(
+            array(
               'dsid' => 'COLLECTION_VIEW',
               'datastream_file' => "$module_path/collection_views/simple_list_view.xml",
             ),
-            array (
+            array(
               'dsid' => 'TN',
               'datastream_file' => "$module_path/images/contentModel.jpg",
               'mimetype' => 'image/jpeg',
             ),
-            array (
+            array(
               'dsid' => 'QUERY',
               'datastream_file' => "$module_path/collection_views/cmodel_collection_query.txt",
               'mimetype' => 'text/plain',
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'islandora:demos',
           'label' => 'Islandora demos collection',
           'cmodel' => 'islandora:collectionCModel',
           'parent' => 'islandora:top',
-          'datastreams' => array (
-            array (
+          'datastreams' => array(
+            array(
               'dsid' => 'TN',
               'datastream_file' => "$module_path/images/Gnome-emblem-photos.png",
               'mimetype' => 'image/png',
             ),
-            array (
+            array(
               'dsid' => 'COLLECTION_POLICY',
               'datastream_file' => "$module_path/collection_policies/COLLECTION-COLLECTION POLICY.xml",
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'islandora:pdf_collection',
           'label' => 'Islandora Demo PDF Collection',
           'cmodel' => 'islandora:collectionCModel',
           'parent' => 'islandora:demos',
-          'datastreams' => array (
-            array (
+          'datastreams' => array(
+            array(
               'dsid' => 'TN',
               'datastream_file' => "$module_path/images/Crystal_Clear_mimetype_pdf.png",
               'mimetype' => 'image/png',
             ),
-            array (
+            array(
               'dsid' => 'COLLECTION_POLICY',
               'datastream_file' => "$module_path/collection_policies/PDF-COLLECTION POLICY.xml",
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'demo:DualResImage',
           'foxml_file' => "$module_path/content_models/demo_DualResImage.xml",
           'datastreams' => array(
-            array (
+            array(
               'dsid' => 'ISLANDORACM',
               'datastream_file' => "$module_path/content_models/STANDARD JPG.xml",
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'demo:DualResImageCollection',
           'foxml_file' => "$module_path/content_models/demo_DualResImageCollection.xml",
           'datastreams' => array(
@@ -1570,47 +1565,47 @@ function fedora_repository_required_fedora_objects() {
             ),
           ),
         ),
-        array (
+        array(
           'pid' => 'demo:DualResolution',
           'foxml_file' => "$module_path/content_models/demo_DualResolution.xml",
         ),
-        array (
+        array(
           'pid' => 'demo:DualResImageImpl',
           'foxml_file' => "$module_path/content_models/demo_DualResImageImpl.xml",
         ),
-        array (
+        array(
           'pid' => 'demo:CollectionImpl',
           'foxml_file' => "$module_path/content_models/demo_CollectionImpl.xml",
         ),
-        array (
+        array(
           'pid' => 'demo:Collection',
           'foxml_file' => "$module_path/content_models/demo_Collection.xml",
         ),
-        array (
+        array(
           'pid' => 'islandora:demo_image_collection',
           'label' => 'Demo Image Collection',
           'cmodel' => 'demo:DualResImageCollection',
           'parent' => 'islandora:demos',
-          'datastreams' => array (
-            array (
+          'datastreams' => array(
+            array(
               'dsid' => 'COLLECTION_POLICY',
               'datastream_file' => "$module_path/collection_policies/JPG-COLLECTION POLICY.xml",
             ),
-            array (
+            array(
               'dsid' => 'TN',
               'datastream_file' => "$module_path/images/Gnome-emblem-photos.png",
               'mimetype' => 'image/png',
             ),
-            array (
+            array(
               'dsid' => 'COLLECTION_VIEW',
               'datastream_file' => "$module_path/collection_views/standard_jpeg_collection_view.xml",
             ),
-            array (
+            array(
               'dsid' => 'QUERY',
               'datastream_file' => "$module_path/collection_views/standard_jpeg_collection_query.txt",
               'mimetype' => 'text/plain',
             ),
-            array (
+            array(
               'dsid' => 'DC',
               'datastream_file' => "$module_path/collection_views/demo_image_collection_dc_record.xml",
             ),
@@ -1939,9 +1934,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)
     );
   }
 
@@ -1964,7 +1959,6 @@ function fedora_repository_display_schema($file) {
   return;
 }
 
-
 function fedora_repository_batch_reingest_object($object, &$context) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
   module_load_include('inc', 'fedora_repository', 'api/fedora_utils');
@@ -1989,8 +1983,8 @@ function fedora_repository_batch_reingest_object($object, &$context) {
       }
     }
     if (!empty($object['dsid']) && !empty($object['datastream_file'])) {
-      $datastreams = array (
-        array (
+      $datastreams = array(
+        array(
           'dsid' => $object['dsid'],
           'datastream_file' => $object['datastream_file'],
         )
@@ -2011,7 +2005,7 @@ function fedora_repository_batch_reingest_object($object, &$context) {
       if (!empty($object['parent'])) {
         $new_item->add_relationship('isMemberOfCollection', $object['parent']);
       }
-      foreach($datastreams as $ds) {
+      foreach ($datastreams as $ds) {
         if ($ds['dsid'] == 'DC') {
           $new_item->modify_datastream_by_value(file_get_contents($ds['datastream_file']), $ds['dsid'], $ds['label'], 'text/xml');
         }
@@ -2037,13 +2031,14 @@ function fedora_repository_get_islandora_datastream_version($item = NULL, $dsid
   $return = NULL;
   if (isset($item)) {
     $doc = simplexml_load_string($item->get_datastream_dissemination($dsid));
-  } elseif (isset($datastream_file)) {
+  }
+  elseif (isset($datastream_file)) {
     $doc = simplexml_load_file($datastream_file);
   }
 
   if (!empty($doc)) {
     $attrs = $doc->attributes();
-    foreach($attrs as $name => $value) {
+    foreach ($attrs as $name => $value) {
       if ($name == 'version') {
         $return = (int) $value;
         break;
@@ -2063,7 +2058,7 @@ function theme_fedora_repository_solution_packs_list($solution_packs) {
 
 
 
-  drupal_add_css(drupal_get_path('module', 'update') .'/update.css');
+  drupal_add_css(drupal_get_path('module', 'update') . '/update.css');
   return $output;
 }
 

fedora_repository.solutionpacks.inc

@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * 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
@@ -87,7 +86,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 +96,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)) {
@@ -137,7 +138,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(

formClass.inc

@@ -1,6 +1,6 @@
 <?php
 
-// $Id$
+
 
 /*
  * Created on Jan 22, 2008
@@ -37,12 +37,12 @@ class formClass {
     );
 
     $items['admin/settings/fedora_repository/demoobjects'] = array(
-        'title' => t('Solution Packs'),
-        'description' => t('Install content models and collections required by installed solution packs.'),
-        'page callback' => 'fedora_repository_solution_packs_page',
-        'access arguments' => array('add fedora datastreams'),
-        'file' => 'fedora_repository.solutionpacks.inc',
-        'type' => MENU_LOCAL_TASK,
+      'title' => t('Solution Packs'),
+      'description' => t('Install content models and collections required by installed solution packs.'),
+      'page callback' => 'fedora_repository_solution_packs_page',
+      'access arguments' => array('add fedora datastreams'),
+      'file' => 'fedora_repository.solutionpacks.inc',
+      'type' => MENU_LOCAL_TASK,
     );
 
     $items['islandoracm.xsd'] = array(
@@ -78,7 +78,7 @@ class formClass {
       'page callback' => 'repository_page',
       'type' => MENU_NORMAL_ITEM,
       'access arguments' => array('view fedora collection'),
-        // 'access' => TRUE
+      // 'access' => TRUE
     );
 
     $items['fedora/repository/service'] = array(
@@ -242,7 +242,7 @@ class formClass {
       '#type' => 'textfield',
       '#title' => t('Fedora RISearch URL'),
       '#default_value' => variable_get('fedora_repository_url',
-          'http://localhost:8080/fedora/risearch'),
+        'http://localhost:8080/fedora/risearch'),
       '#description' => t('The url of the Fedora server'), '#required' => TRUE,
       '#weight' => 0
     );
@@ -577,7 +577,6 @@ class formClass {
         if (!empty($newElements)) {
           $available_dsids = array_merge($available_dsids, $newElements);
         }
-
       }
     }
 
@@ -640,10 +639,10 @@ class formClass {
     );
 
     if (!empty($unused_dsids)) {
-       $dsidsForForm = array();
-        foreach ($unused_dsids as $dsid){
-            $dsidsForForm[$dsid]=$dsid;
-        }
+      $dsidsForForm = array();
+      foreach ($unused_dsids as $dsid) {
+        $dsidsForForm[$dsid] = $dsid;
+      }
       $form['stream_id'] = array(
         '#type' => 'select',
         '#title' => t('Datastream ID'),

form_elements/css/copyright.css

@@ -1,7 +1,7 @@
 .cc_preview 
 {
-  width: 250px; 
-  overflow: none;
-  border: 0px solid black;
-  float: right;
+    width: 250px;
+    overflow: none;
+    border: 0px solid black;
+    float: right;
 }

form_elements/css/filechooser.css

@@ -3,24 +3,24 @@
     float: left;
     background-color: #dfdfdf;
 
-   /*
-    position: relative;
-    visibility: hidden;
-    left: -5000px;*/
+    /*
+     position: relative;
+     visibility: hidden;
+     left: -5000px;*/
 
-   width: 680px;
-   height: 200px;
+    width: 680px;
+    height: 200px;
 
 }
 
 .carousel li
 {
-  cursor:pointer;
+    cursor:pointer;
 }
 
 .carousel li.selected
 {
-  background-color: #999;
+    background-color: #999;
 }
 
 .carousel li div
@@ -56,38 +56,38 @@
 
 .carousel li div.audioplaceholder 
 { 
-  width: 128px;
-  height: 128px;
-  margin: 10px 10px 0 10px;
-  background-image: url('../images/video.png');
-  background-repeat:no-repeat;
+    width: 128px;
+    height: 128px;
+    margin: 10px 10px 0 10px;
+    background-image: url('../images/video.png');
+    background-repeat:no-repeat;
 }
 
 .carousel li div.imageplaceholder 
 { 
-  width: 128px;
-  height: 128px;
-  margin: 10px 10px 0 10px;
-  background-image: url('../images/image.png');
-  background-repeat:no-repeat;
+    width: 128px;
+    height: 128px;
+    margin: 10px 10px 0 10px;
+    background-image: url('../images/image.png');
+    background-repeat:no-repeat;
 }
 
 .carousel li div.applicationplaceholder 
 { 
-  width: 128px;
-  height: 128px;
-  margin: 10px 10px 0 10px;
-  background-image: url('../images/application.png');
-  background-repeat:no-repeat;
+    width: 128px;
+    height: 128px;
+    margin: 10px 10px 0 10px;
+    background-image: url('../images/application.png');
+    background-repeat:no-repeat;
 }
 
 
 .carousel li.loading 
 {
-  font-size: 150%;
-  margin: auto;
-  margin-top: 50px;
-  text-align: center;
+    font-size: 150%;
+    margin: auto;
+    margin-top: 50px;
+    text-align: center;
 
-  width: 250px;
+    width: 250px;
 }

form_elements/css/list.css

@@ -1,25 +1,25 @@
 .tagEditor
 {
-	margin: 4px 0;
-	padding: 0;
+    margin: 4px 0;
+    padding: 0;
 }
 
 .tagEditor li
 {
-	display: inline;
-	background-image: url('../images/minus_small.png');
-	background-color: #efe;
-	background-position: right center;
-	background-repeat: no-repeat;
-	list-style-type: none;
-	padding: 0 18px 0 6px;
-	margin: 0 4px;	
-	cursor: pointer;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
+    display: inline;
+    background-image: url('../images/minus_small.png');
+    background-color: #efe;
+    background-position: right center;
+    background-repeat: no-repeat;
+    list-style-type: none;
+    padding: 0 18px 0 6px;
+    margin: 0 4px;
+    cursor: pointer;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
 }
 
 .tagEditor li:hover
 {
-	background-color: #eee;
+    background-color: #eee;
 }

form_elements/css/people.css

@@ -4,134 +4,134 @@
 
 #ife-peoplelist-table 
 {
-  margin-top: 15px;
-  width: 100%;
+    margin-top: 15px;
+    width: 100%;
 }
 
 #ife-peoplelist-table .form-item {
-  margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #ife-peoplelist-table .form-item .description {
-  margin-top: 3px;
+    margin-top: 3px;
 }
 #ife-peoplelist-table .ife-person-name {
-  width: auto;
-  height: 125px;
+    width: auto;
+    height: 125px;
 }
 
 #ife-peoplelist-table .ife-person-name label{
-  font-weight: bold;
-  float: left;
-  clear: left;
-  width: 125px;
+    font-weight: bold;
+    float: left;
+    clear: left;
+    width: 125px;
 }
 
 
 #ife-peoplelist-table .ife-person-role {
-  width: 150px;
-  padding-right: 50px;
+    width: 150px;
+    padding-right: 50px;
 }
 
 #ife-peoplelist-table .ife-person-remove {
-  width: 100px;
+    width: 100px;
 }
 
 #ife-peoplelist-table .description {
-  white-space: normal;
+    white-space: normal;
 }
 
 
 #ife-peoplelist-table .ife-person-content .form-item .form-text {
-  width: 150px;
+    width: 150px;
 }
 #ife-peoplelist-table .ife-person-view-content input.form-submit {
-  display: none;
+    display: none;
 }
 #ife-peoplelist-table .ife-person-content {
-  display: none;
+    display: none;
 }
 
 #ife-peoplelist-table .ife-person-remove label,
 #add-more-people-button label,
 #add-more-conf-button label,
 #add-more-org-button label {
-  font-weight: bold;
-  float: left;
-  clear: left;
-  width: auto;
+    font-weight: bold;
+    float: left;
+    clear: left;
+    width: auto;
 }
 
 #add-more-org-button,
 #add-more-conf-button,
 #add-more-people-button {
-  width: 150px;
-  display: block;
-  margin-top: 20px;
-  float: right;
+    width: 150px;
+    display: block;
+    margin-top: 20px;
+    float: right;
 }
 
 
 .add-person, .add-conf, .add-org,
 #ife-peoplelist-table .delete-person {
-  display: block;
-  overflow: hidden;
-  width: 32px;
-  height: 32px;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  text-indent: -9999px;
-  cursor: pointer; /* hand-shaped cursor */
-  cursor: hand; /* for IE 5.x */
+    display: block;
+    overflow: hidden;
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    text-indent: -9999px;
+    cursor: pointer; /* hand-shaped cursor */
+    cursor: hand; /* for IE 5.x */
 }
 
 .add-person {
-  background: transparent url(../images/add_user.png) no-repeat 0 0;
+    background: transparent url(../images/add_user.png) no-repeat 0 0;
 }
 .delete-person {
-  background: transparent url(../images/editdelete.png) no-repeat 0 0;
+    background: transparent url(../images/editdelete.png) no-repeat 0 0;
 }
 
 .add-org {
-  background: transparent url(../images/add_group.png) no-repeat 0 0;
+    background: transparent url(../images/add_group.png) no-repeat 0 0;
 }
 .add-conf {
-  background: transparent url(../images/groupevent.png) no-repeat 0 0;
+    background: transparent url(../images/groupevent.png) no-repeat 0 0;
 }
 
 /* QT style selection form */
 
 div.ife-people-preview {
-  border: none;
-  width: 280px;
-  height: 80px;
+    border: none;
+    width: 280px;
+    height: 80px;
 }
 
 #ife-people-settings .ife-people-styles .form-item {
-  width: 280px;
-  float: left;
-  margin: 0 10px 10px 0;
-  border: 1px solid #ccc;
-  background-color: #fff;
+    width: 280px;
+    float: left;
+    margin: 0 10px 10px 0;
+    border: 1px solid #ccc;
+    background-color: #fff;
 }
 #ife-people-settings .ife-people-styles .form-item .option {
-  display: block;
-  background-color: #bfe3ff;
-  font: bold 12px/18px verdana;
-  color: #0a5793;
+    display: block;
+    background-color: #bfe3ff;
+    font: bold 12px/18px verdana;
+    color: #0a5793;
 }
 #ife-people-settings .ife-people-styles .form-item .option:hover {
-  background-color: #aadaff;
-  cursor: pointer;
-  color: #003863;
+    background-color: #aadaff;
+    cursor: pointer;
+    color: #003863;
 }
 #ife-people-settings .ife-people-styles .form-item .option .form-radio {
-  margin-right: 5px;
-  float: left;
-  height: 15px;
-  margin-top: 2px;
+    margin-right: 5px;
+    float: left;
+    height: 15px;
+    margin-top: 2px;
 }
 #ife-people-settings .ife-people_wrapper {
-  margin: 5px;
-  font: bold 12px/170% Verdana;
+    margin: 5px;
+    font: bold 12px/170% Verdana;
 }

form_elements/css/sticky.css

@@ -1,18 +1,18 @@
 
 input.sticky {
-height: 18px;
-padding-left: 15px;
-background: url(../images/pushpin.png) top left no-repeat;
-  filter:alpha(opacity=50);
-        -moz-opacity:0.5;
-        -khtml-opacity:0.5;
-        opacity:0.5;
+    height: 18px;
+    padding-left: 15px;
+    background: url(../images/pushpin.png) top left no-repeat;
+    filter:alpha(opacity=50);
+    -moz-opacity:0.5;
+    -khtml-opacity:0.5;
+    opacity:0.5;
 }
 
 input.sticky:checked {
-  background-image: url(../images/pushpin.png);
-  filter:alpha(opacity=100);
-        -moz-opacity:1;
-        -khtml-opacity:1;
-        opacity:1;
+    background-image: url(../images/pushpin.png);
+    filter:alpha(opacity=100);
+    -moz-opacity:1;
+    -khtml-opacity:1;
+    opacity:1;
 }

form_elements/css/ui-lightness/jquery-ui-1.8.4.custom.css

@@ -6,7 +6,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming/API
- */
+*/
 
 /* Layout helpers
 ----------------------------------*/
@@ -51,7 +51,7 @@
  * http://docs.jquery.com/UI/Theming/API
  *
  * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
+*/
 
 
 /* Component containers
@@ -300,7 +300,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Resizable#theming
- */
+*/
 .ui-resizable { position: relative;}
 .ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
@@ -319,7 +319,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectable#theming
- */
+*/
 .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
 /*
  * jQuery UI Accordion @VERSION
@@ -329,7 +329,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Accordion#theming
- */
+*/
 /* IE/Win - Fix animation bug - #4615 */
 .ui-accordion { width: 100%; }
 .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
@@ -347,7 +347,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Autocomplete#theming
- */
+*/
 .ui-autocomplete { position: absolute; cursor: default; }	
 
 /* workarounds */
@@ -361,36 +361,36 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Menu#theming
- */
+*/
 .ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
+    list-style:none;
+    padding: 2px;
+    margin: 0;
+    display:block;
+    float: left;
 }
 .ui-menu .ui-menu {
-	margin-top: -3px;
+    margin-top: -3px;
 }
 .ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
+    margin:0;
+    padding: 0;
+    zoom: 1;
+    float: left;
+    clear: left;
+    width: 100%;
 }
 .ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
+    text-decoration:none;
+    display:block;
+    padding:.2em .4em;
+    line-height:1.5;
+    zoom:1;
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
+    font-weight: normal;
+    margin: -1px;
 }
 /*
  * jQuery UI Button @VERSION
@@ -400,7 +400,7 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Button#theming
- */
+*/
 .ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
 .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
 button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
@@ -438,7 +438,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Dialog#theming
- */
+*/
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
 .ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
@@ -459,7 +459,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Slider#theming
- */
+*/
 .ui-slider { position: relative; text-align: left; }
 .ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
 .ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
@@ -482,7 +482,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Tabs#theming
- */
+*/
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
 .ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
@@ -500,7 +500,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Datepicker#theming
- */
+*/
 .ui-datepicker { width: 17em; padding: .2em .2em 0; }
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
@@ -567,6 +567,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Progressbar#theming
- */
+*/
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

form_elements/includes/autocomplete.inc

@@ -1,214 +1,213 @@
 <?php
 
-// $Id$
 
-function ife_autocomplete_person($string)  {
-    $string=trim(strtolower($string));
 
-    module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-    module_load_include('php', 'islandora_solr_search', 'Solr/Service');
-    $host = variable_get('islandora_solr_search_block_host','localhost');
-    $port = variable_get('islandora_solr_search_block_port','8080');
-    $appName = variable_get('islandora_solr_search_block_app_name','solr');
-    $requestHandler = variable_get("islandora_solr_search_block_request_handler",t("standard"));   
+function ife_autocomplete_person($string) {
+  $string = trim(strtolower($string));
 
-    $solr = new Apache_Solr_Service($host, $port, '/'.$appName.'/');
+  module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+  module_load_include('php', 'islandora_solr_search', 'Solr/Service');
+  $host = variable_get('islandora_solr_search_block_host', 'localhost');
+  $port = variable_get('islandora_solr_search_block_port', '8080');
+  $appName = variable_get('islandora_solr_search_block_app_name', 'solr');
+  $requestHandler = variable_get("islandora_solr_search_block_request_handler", t("standard"));
 
-		$string=$solr->escape($string);
-		$query = 'name_personal_t:'.$string.'* OR name_organization_t:'.$string.'* OR name_conference_t:'.$string.'*';
+  $solr = new Apache_Solr_Service($host, $port, '/' . $appName . '/');
 
-    $additionalParams = array(
-            'facet' => 'false',
-            'qt' => $requestHandler,
-    );
+  $string = $solr->escape($string);
+  $query = 'name_personal_t:' . $string . '* OR name_organization_t:' . $string . '* OR name_conference_t:' . $string . '*';
 
-    try {
-      $results = $solr->search($query, 0, 10,$additionalParams);
-    }catch (Exception $e) {
-      drupal_set_message(t('error searching ').$e->getMessage());
-    }
-    if(empty($results)){
-      drupal_set_message(t('Error searching solr index. Is the solr search block configured properly?'),'error');
-      return ' ';
-    }
+  $additionalParams = array(
+    'facet' => 'false',
+    'qt' => $requestHandler,
+  );
+
+  try {
+    $results = $solr->search($query, 0, 10, $additionalParams);
+  } catch (Exception $e) {
+    drupal_set_message(t('error searching ') . $e->getMessage());
+  }
+  if (empty($results)) {
+    drupal_set_message(t('Error searching solr index. Is the solr search block configured properly?'), 'error');
+    return ' ';
+  }
 
-    header('content-type: text/plain');
-    $matches = array();
+  header('content-type: text/plain');
+  $matches = array();
 
-    foreach($results->response->docs as $doc) {
+  foreach ($results->response->docs as $doc) {
 
-      $item = new fedora_item($doc->id);
+    $item = new fedora_item($doc->id);
 
-      $mods = $item->get_datastream_dissemination('MODS');
-      if (trim($mods) != '')  {
-	$modsDom = new DomDocument();    
-	$modsDom->loadXML($mods);
+    $mods = $item->get_datastream_dissemination('MODS');
+    if (trim($mods) != '') {
+      $modsDom = new DomDocument();
+      $modsDom->loadXML($mods);
 
-	$xpath = new DOMXPath($modsDom);
-	$xpath->registerNamespace("php", "http://php.net/xpath");
-	$xpath->registerPHPFunctions();
+      $xpath = new DOMXPath($modsDom);
+      $xpath->registerNamespace("php", "http://php.net/xpath");
+      $xpath->registerPHPFunctions();
 //  	echo $mods;
-	$nodeList = $xpath->evaluate('/mods:mods/mods:name');
-	foreach ($nodeList as $node) {
-	  
-	  $type=$node->getAttribute('type');
-	  $title=null;
-	  $name =null;
-	  $given=null;
-	  $family=null;
-	  $date = null;
-	  $nameParts = $node->getElementsByTagName('namePart');
-	  foreach ($nameParts as $part) {
-	    switch ($part->getAttribute('type')) {
-	      case 'given': $given = $part->nodeValue; break;
-	      case 'family': $family = $part->nodeValue; break;
-	      case 'termsOfAddress': $title= $part->nodeValue; break;
-	      case 'date': $date = $part->nodeValue; break;
-	      default: $name = $part->nodeValue; break;
-	    }
-	  }
-	  
-	  if ($name == null && isset($given) && isset($family)) { 
-	     $name = (isset($title)?$title.' ':'').$family.', '.$given;
-	  }
-
-	  $role =null;
-	  $roleTerm = $node->getElementsByTagName('roleTerm');
-	  if ($roleTerm->length > 0) {
-	    $role=$roleTerm->item(0)->nodeValue;
-	  }
-	  
-	  if (strpos(strtolower($name),$string)!==FALSE) {
-	    $display = $name;
-	    $matches[json_encode(array('type'=>trim($type),'name'=>trim($name),'role'=>trim($role),'date'=>trim($date)))]= $display.' - '.$role.' '.$date;
-	  }
-	}
+      $nodeList = $xpath->evaluate('/mods:mods/mods:name');
+      foreach ($nodeList as $node) {
+
+        $type = $node->getAttribute('type');
+        $title = NULL;
+        $name = NULL;
+        $given = NULL;
+        $family = NULL;
+        $date = NULL;
+        $nameParts = $node->getElementsByTagName('namePart');
+        foreach ($nameParts as $part) {
+          switch ($part->getAttribute('type')) {
+            case 'given': $given = $part->nodeValue;
+              break;
+            case 'family': $family = $part->nodeValue;
+              break;
+            case 'termsOfAddress': $title = $part->nodeValue;
+              break;
+            case 'date': $date = $part->nodeValue;
+              break;
+            default: $name = $part->nodeValue;
+              break;
+          }
+        }
+
+        if ($name == NULL && isset($given) && isset($family)) {
+          $name = (isset($title) ? $title . ' ' : '') . $family . ', ' . $given;
+        }
+
+        $role = NULL;
+        $roleTerm = $node->getElementsByTagName('roleTerm');
+        if ($roleTerm->length > 0) {
+          $role = $roleTerm->item(0)->nodeValue;
+        }
+
+        if (strpos(strtolower($name), $string) !== FALSE) {
+          $display = $name;
+          $matches[json_encode(array('type' => trim($type), 'name' => trim($name), 'role' => trim($role), 'date' => trim($date)))] = $display . ' - ' . $role . ' ' . $date;
+        }
       }
     }
-    drupal_json($matches); exit();
-    
+  }
+  drupal_json($matches);
+  exit();
 }
 
 function ife_autocomplete_marcrelator($collection, $string='') {
   $moduleRoot = drupal_get_path('module', 'islandora_form_elements');
 
   if ($string == '') {
-     $string = $collection;
-     $collection = FALSE;
-   }
-
-   $string=ucfirst(trim($string));
-   
-   $dom = DOMDocument::load ( $moduleRoot .'/xml/relators.rdf' );
-   $rootEl = $dom->getElementsByTagName('RDF');
-   if ($rootEl->length > 0) {
-     $rootEl=$rootEl->item(0);
+    $string = $collection;
+    $collection = FALSE;
+  }
 
-     $xpath = new DOMXPath($dom);
-     $xpath->registerNamespace ( 'skos' , $rootEl->getAttribute('xmlns:skos') );
-     $xpath->registerNamespace ( 'rdf' , $rootEl->getAttribute('xmlns:rdf') );
+  $string = ucfirst(trim($string));
 
+  $dom = DOMDocument::load($moduleRoot . '/xml/relators.rdf');
+  $rootEl = $dom->getElementsByTagName('RDF');
+  if ($rootEl->length > 0) {
+    $rootEl = $rootEl->item(0);
 
-     $result = $xpath->query('/rdf:RDF/rdf:Description[starts-with(skos:prefLabel, "'. $string .'")]');
+    $xpath = new DOMXPath($dom);
+    $xpath->registerNamespace('skos', $rootEl->getAttribute('xmlns:skos'));
+    $xpath->registerNamespace('rdf', $rootEl->getAttribute('xmlns:rdf'));
 
-     $terms = array();
-     foreach ($result as $term) {
-       $termVal =$term->getElementsByTagName('prefLabel')->item(0)->nodeValue;
-       $termVal = preg_replace('/\s+/', ' ', $termVal);
-       $terms[$term->getElementsByTagName('notation')->item(0)->nodeValue]= $termVal;
-     }
-     echo drupal_json($terms);
-   }
 
+    $result = $xpath->query('/rdf:RDF/rdf:Description[starts-with(skos:prefLabel, "' . $string . '")]');
 
+    $terms = array();
+    foreach ($result as $term) {
+      $termVal = $term->getElementsByTagName('prefLabel')->item(0)->nodeValue;
+      $termVal = preg_replace('/\s+/', ' ', $termVal);
+      $terms[$term->getElementsByTagName('notation')->item(0)->nodeValue] = $termVal;
+    }
+    echo drupal_json($terms);
+  }
 }
 
 function ife_autocomplete_gacs($collection, $string='') {
   $moduleRoot = drupal_get_path('module', 'islandora_form_elements');
 
   if ($string == '') {
-     $string = $collection;
-     $collection = FALSE;
-   }
-
-   $string=ucwords(trim($string));
-   
-   $dom = DOMDocument::load ( $moduleRoot .'/xml/gacs.xml' );
-   $rootEl = $dom->getElementsByTagName('codelist');
-   if ($rootEl->length > 0) {
-     $rootEl=$rootEl->item(0);
+    $string = $collection;
+    $collection = FALSE;
+  }
 
-     $xpath = new DOMXPath($dom);
-     $xpath->registerNamespace ( 'a' , $rootEl->getAttribute('xmlns') );
+  $string = ucwords(trim($string));
 
-     $result = $xpath->query('/a:codelist/a:gacs/a:gac[starts-with(a:name, "'. $string .'")]');
+  $dom = DOMDocument::load($moduleRoot . '/xml/gacs.xml');
+  $rootEl = $dom->getElementsByTagName('codelist');
+  if ($rootEl->length > 0) {
+    $rootEl = $rootEl->item(0);
 
-     $gacs = array();
-     foreach ($result as $gac) {
-       $gacs[$gac->getElementsByTagName('name')->item(0)->nodeValue]= $gac->getElementsByTagName('name')->item(0)->nodeValue;
-     }
-     echo drupal_json($gacs);
-   }
+    $xpath = new DOMXPath($dom);
+    $xpath->registerNamespace('a', $rootEl->getAttribute('xmlns'));
 
+    $result = $xpath->query('/a:codelist/a:gacs/a:gac[starts-with(a:name, "' . $string . '")]');
 
+    $gacs = array();
+    foreach ($result as $gac) {
+      $gacs[$gac->getElementsByTagName('name')->item(0)->nodeValue] = $gac->getElementsByTagName('name')->item(0)->nodeValue;
+    }
+    echo drupal_json($gacs);
+  }
 }
 
 function ife_autocomplete_language($collection, $string='') {
-  $moduleRoot=drupal_get_path('module', 'islandora_form_elements');
+  $moduleRoot = drupal_get_path('module', 'islandora_form_elements');
 
   if ($string == '') {
-     $string = $collection;
-     $collection = FALSE;
-   }
-
-   $string=ucwords(trim($string));
-   
-   $dom = DOMDocument::load ( $moduleRoot .'/xml/languages.xml' );
-   $rootEl = $dom->getElementsByTagName('codelist');
-   if ($rootEl->length > 0) {
-     $rootEl=$rootEl->item(0);
+    $string = $collection;
+    $collection = FALSE;
+  }
 
-     $xpath = new DOMXPath($dom);
-     $xpath->registerNamespace ( 'a' , $rootEl->getAttribute('xmlns') );
+  $string = ucwords(trim($string));
 
-     $result = $xpath->query('/a:codelist/a:languages/a:language[starts-with(a:name, "'. $string .'")]');
+  $dom = DOMDocument::load($moduleRoot . '/xml/languages.xml');
+  $rootEl = $dom->getElementsByTagName('codelist');
+  if ($rootEl->length > 0) {
+    $rootEl = $rootEl->item(0);
 
-     $languages = array();
-     foreach ($result as $lang) {
-       $languages[$lang->getElementsByTagName('name')->item(0)->nodeValue]= $lang->getElementsByTagName('name')->item(0)->nodeValue;
-     }
-     echo drupal_json($languages);
-   }
+    $xpath = new DOMXPath($dom);
+    $xpath->registerNamespace('a', $rootEl->getAttribute('xmlns'));
 
+    $result = $xpath->query('/a:codelist/a:languages/a:language[starts-with(a:name, "' . $string . '")]');
 
+    $languages = array();
+    foreach ($result as $lang) {
+      $languages[$lang->getElementsByTagName('name')->item(0)->nodeValue] = $lang->getElementsByTagName('name')->item(0)->nodeValue;
+    }
+    echo drupal_json($languages);
+  }
 }
 
 function ife_autocomplete($field, $collection, $string='') {
 
-	if ($string == '') {
-		$string=$collection; $collection=FALSE;
-	}
+  if ($string == '') {
+    $string = $collection;
+    $collection = FALSE;
+  }
 
   module_load_include('php', 'islandora_solr_search', 'Solr/Service');
   $host = variable_get('islandora_solr_search_block_host', 'localhost');
   $port = variable_get('islandora_solr_search_block_port', '8080');
   $appName = variable_get('islandora_solr_search_block_app_name', 'solr');
-  $solr = new Apache_Solr_Service($host, $port, '/'. $appName .'/');
+  $solr = new Apache_Solr_Service($host, $port, '/' . $appName . '/');
 
   $additionalParams = array(
     'fl' => $field
   );
 
-  $query = $field .':'. $solr->escape(strtolower(trim($string))) .'*';
+  $query = $field . ':' . $solr->escape(strtolower(trim($string))) . '*';
 
   if ($collection != FALSE) {
-    $query .= ' AND related_item_identifier_t:'. $solr->escape($collection);
+    $query .= ' AND related_item_identifier_t:' . $solr->escape($collection);
   }
 
   try {
     $results = $solr->search($query, 0, 10, $additionalParams);
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
     drupal_set_message(t('error searching ') . $e->getMessage());
   }
 
@@ -216,16 +215,17 @@ function ife_autocomplete($field, $collection, $string='') {
   $values = array();
   if ($docs != NULL) {
     foreach ($docs as $doc) {
-      $resfield=$doc->getField($field);
+      $resfield = $doc->getField($field);
 
       if (is_array($resfield['value'])) {
-	foreach ($resfield['value'] as $val) { 
-	  if (preg_match('/^'.strtolower($string).'/i',$val)) {
-	    $values[$val]=$val;
-	  }
-	}
-      } else {
-	$values[$resfield['value']]=$resfield['value'];
+        foreach ($resfield['value'] as $val) {
+          if (preg_match('/^' . strtolower($string) . '/i', $val)) {
+            $values[$val] = $val;
+          }
+        }
+      }
+      else {
+        $values[$resfield['value']] = $resfield['value'];
       }
     }
   }

form_elements/includes/creative_commons.inc

@@ -1,8 +1,8 @@
 <?php
-    class CreativeCommons
-    { 
 
-      public static $cc_jurisdiction_vals = array(
+class CreativeCommons {
+
+  public static $cc_jurisdiction_vals = array(
     '' => 'International',
     'ar' => 'Argentina',
     'au' => 'Australia',
@@ -57,61 +57,60 @@
     'scotland' => 'UK:Scotland',
     'us' => 'UnitedStates',
     'vn' => 'Vietnam');
+  public static $cc_versions = array(
+    '' => '3.0',
+    'ar' => '2.5',
+    'au' => '3.0',
+    'at' => '3.0',
+    'be' => '2.0',
+    'br' => '3.0',
+    'bg' => '2.5',
+    'ca' => '2.5',
+    'cl' => '2.0',
+    'cn' => '2.5',
+    'co' => '2.5',
+    'hr' => '3.0',
+    'cz' => '3.0',
+    'dk' => '2.5',
+    'ec' => '3.0',
+    'fi' => '1.0',
+    'fr' => '2.0',
+    'de' => '3.0',
+    'gr' => '3.0',
+    'gt' => '3.0',
+    'hk' => '3.0',
+    'hu' => '2.5',
+    'in' => '2.5',
+    'il' => '2.5',
+    'it' => '2.5',
+    'jp' => '2.0',
+    'kr' => '2.0',
+    'lu' => '3.0',
+    'mk' => '2.5',
+    'my' => '2.5',
+    'mt' => '2.5',
+    'mx' => '2.5',
+    'nl' => '3.0',
+    'nz' => '3.0',
+    'no' => '3.0',
+    'pe' => '2.5',
+    'ph' => '3.0',
+    'pl' => '3.0',
+    'pt' => '2.5',
+    'pr' => '3.0',
+    'ro' => '3.0',
+    'rs' => '3.0',
+    'sg' => '3.0',
+    'si' => '2.5',
+    'za' => '2.5',
+    'es' => '3.0',
+    'se' => '2.5',
+    'ch' => '2.5',
+    'tw' => '3.0',
+    'th' => '3.0',
+    'uk' => '2.0',
+    'scotland' => '2.5',
+    'us' => '3.0',
+    'vn' => '3.0');
 
-   public static  $cc_versions = array(
-    ''=>'3.0',
-    'ar'=>'2.5',
-    'au'=>'3.0',
-    'at'=>'3.0',
-    'be'=>'2.0',
-    'br'=>'3.0',
-    'bg'=>'2.5',
-    'ca'=>'2.5',
-    'cl'=>'2.0',
-    'cn'=>'2.5',
-    'co'=>'2.5',
-    'hr'=>'3.0',
-    'cz'=>'3.0',
-    'dk'=>'2.5',
-    'ec'=>'3.0',
-    'fi'=>'1.0',
-    'fr'=>'2.0',
-    'de'=>'3.0',
-    'gr'=>'3.0',
-    'gt'=>'3.0',
-    'hk'=>'3.0',
-    'hu'=>'2.5',
-    'in'=>'2.5',
-    'il'=>'2.5',
-    'it'=>'2.5',
-    'jp'=>'2.0',
-    'kr'=>'2.0',
-    'lu'=>'3.0',
-    'mk'=>'2.5',
-    'my'=>'2.5',
-    'mt'=>'2.5',
-    'mx'=>'2.5',
-    'nl'=>'3.0',
-    'nz'=>'3.0',
-    'no'=>'3.0',
-    'pe'=>'2.5',
-    'ph'=>'3.0',
-    'pl'=>'3.0',
-    'pt'=>'2.5',
-    'pr'=>'3.0',
-    'ro'=>'3.0',
-    'rs'=>'3.0',
-    'sg'=>'3.0',
-    'si'=>'2.5',
-    'za'=>'2.5',
-    'es'=>'3.0',
-    'se'=>'2.5',
-    'ch'=>'2.5',
-    'tw'=>'3.0',
-    'th'=>'3.0',
-    'uk'=>'2.0',
-    'scotland'=>'2.5',
-    'us'=>'3.0',
-    'vn'=>'3.0');
-
-    }
+}

form_elements/includes/filechooser.inc

@@ -1,38 +1,36 @@
 <?php
 
-// $Id$
+
 
 function theme_filechooser($element) {
   global $base_url;
-  $path=drupal_get_path('module', 'islandora_form_elements');
+  $path = drupal_get_path('module', 'islandora_form_elements');
 
-  drupal_add_js($path .'/js/jcarousellite_1.0.1.js');
-  drupal_add_js($path .'/js/jquery.easing.1.1.js');
-  drupal_add_js($path .'/js/jquery.mousewheel.min.js');
-  drupal_add_js($path .'/js/jquery.loadImages.1.0.1.js');
-  drupal_add_js($path .'/js/jquery.breakly-1.0.js');
-  drupal_add_js($path .'/js/filechooser.js');
-  drupal_add_css($path .'/css/filechooser.css');
+  drupal_add_js($path . '/js/jcarousellite_1.0.1.js');
+  drupal_add_js($path . '/js/jquery.easing.1.1.js');
+  drupal_add_js($path . '/js/jquery.mousewheel.min.js');
+  drupal_add_js($path . '/js/jquery.loadImages.1.0.1.js');
+  drupal_add_js($path . '/js/jquery.breakly-1.0.js');
+  drupal_add_js($path . '/js/filechooser.js');
+  drupal_add_css($path . '/css/filechooser.css');
 
   module_load_include('inc', 'fedora_repository', 'ContentModel');
   $contentModelPid = ContentModel::getPidFromIdentifier($element['#model_pid']);
 
 
-  $output='<div class="carousel">
+  $output = '<div class="carousel">
       <div class="jCarouselLite">
     <ul id="fileList" class="clear-block">
-    <li class="loading"><div>Generating File Previews...<br/>(this could take a minute or two.)<br/><img src="'.$base_url.'/'. $path .'/images/ajax-loader.gif" id="ajaxBusy" alt="Loading"/></div></li>
+    <li class="loading"><div>Generating File Previews...<br/>(this could take a minute or two.)<br/><img src="' . $base_url . '/' . $path . '/images/ajax-loader.gif" id="ajaxBusy" alt="Loading"/></div></li>
     </ul>
       </div>
   <br clear="all"/>
   <a href="#" class="prev">Prev</a> <a href="#" class="next">Next</a>
-  <input type="hidden" id="model_pid" value="'. $contentModelPid .'"/>
-  <input type="hidden" name="'. $element['#name'] .'" value="'. check_plain($element['#value']) .'" id="fileField"/></div>';
+  <input type="hidden" id="model_pid" value="' . $contentModelPid . '"/>
+  <input type="hidden" name="' . $element['#name'] . '" value="' . check_plain($element['#value']) . '" id="fileField"/></div>';
   return theme('form_element', $element, $output);
 }
 
-
-
 function ife_filechooser_get_thumbnail($cp_pid, $cm_pid, $file) {
   module_load_include('inc', 'fedora_repository', 'CollectionPolicy');
   module_load_include('inc', 'fedora_repository', 'ContentModel');
@@ -42,38 +40,36 @@ function ife_filechooser_get_thumbnail($cp_pid, $cm_pid, $file) {
 
   $cm = ContentModel::loadFromModel($cm_pid);
   $cp = CollectionPolicy::loadFromCollection($cp_pid);
-  $path=$cp->getStagingArea() .'/';
+  $path = $cp->getStagingArea() . '/';
 
   if ($cm !== FALSE && $cp !== FALSE) {
     if (is_file($path . $file)) {
 
-      $mime=$mimeClass->getType($path . $file);  
+      $mime = $mimeClass->getType($path . $file);
 
       $allowed_types = $cm->getMimetypes();
 
       if (in_array($mime, $allowed_types)) {
 
-      $thumbnail = '';
-      //executes ingest rules with the "preview" parameter set.
-      if ($cm->execIngestRules($path . $file, $mime, TRUE) && isset($_SESSION['fedora_ingest_files']['TN']) && file_exists($_SESSION['fedora_ingest_files']['TN'])) {
-        $thumbnail=$_SESSION['fedora_ingest_files']['TN'];
-      }
+        $thumbnail = '';
+        //executes ingest rules with the "preview" parameter set.
+        if ($cm->execIngestRules($path . $file, $mime, TRUE) && isset($_SESSION['fedora_ingest_files']['TN']) && file_exists($_SESSION['fedora_ingest_files']['TN'])) {
+          $thumbnail = $_SESSION['fedora_ingest_files']['TN'];
+        }
 
-      $thumbmime=$mimeClass->getType($thumbnail); 
+        $thumbmime = $mimeClass->getType($thumbnail);
 
-      header('Pragma: no-cache');
-      header('Content-Type: '. $thumbmime);
-      echo file_get_contents($thumbnail);
-      exit();
+        header('Pragma: no-cache');
+        header('Content-Type: ' . $thumbmime);
+        echo file_get_contents($thumbnail);
+        exit();
       }
     }
-       
   }
-  
 }
-function ife_filechooser_cmp($a,$b)
-{
-    return strcmp($a['name'],$b['name']);
+
+function ife_filechooser_cmp($a, $b) {
+  return strcmp($a['name'], $b['name']);
 }
 
 function ife_filechooser_generate_thumbnails($cp_pid, $cm_pid) {
@@ -84,55 +80,55 @@ function ife_filechooser_generate_thumbnails($cp_pid, $cm_pid) {
   $cm = ContentModel::loadFromModel($cm_pid);
   $cp = CollectionPolicy::loadFromCollection($cp_pid);
 
-	if ($cm === FALSE || $cp === FALSE) {
-		echo '[]'; exit();
-	}
+  if ($cm === FALSE || $cp === FALSE) {
+    echo '[]';
+    exit();
+  }
 
   $mimeClass = new MimeClass();
-  $path=$cp->getStagingArea() .'/';
-  $start=isset($_GET['start'])?intval($_GET['start']):0;
-  $end=isset($_GET['end'])?intval($_GET['end']):50;
+  $path = $cp->getStagingArea() . '/';
+  $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+  $end = isset($_GET['end']) ? intval($_GET['end']) : 50;
   $thumbnails = array();
   $files = array();
   if ($cm !== FALSE && $cp !== FALSE) {
-     $allowed_types = $cm->getMimetypes();
-		 if (file_exists($path) && is_dir($path)) {
-       $dir = opendir($path);
-       for ($i=$start; $i < $end && ($file = readdir($dir)) !== FALSE;) {
-         if (is_file($path . $file)) {
-           $mime=$mimeClass->getType($path . $file);  
-           if (in_array($mime, $allowed_types)) {
-             
-             $thumbnail = FALSE;
-             //executes ingest rules with the "preview" parameter set.
-             if ($cm->execIngestRules($path . $file, $mime, TRUE) && isset($_SESSION['fedora_ingest_files']['TN']) && file_exists($_SESSION['fedora_ingest_files']['TN'])) {
-               $thumbnail=$_SESSION['fedora_ingest_files']['TN'];
-               unset($_SESSION['fedora_ingest_files']['TN']);
-             }
-             
-             $res_array = getimagesize($path .'/'. $file);
-             $res = '';
-             if (is_array($res_array)) {
-               $res = $res_array[0] .'x'. $res_array[1];
-             }
-             
-             $size = filesize($path .'/'. $file);
-             $labels = array('kB', 'MB', 'GB', 'TB');
-             $label = 'B';
-             while ($size > 1024) {
-               $size=$size/1024;
-               $label=array_shift($labels); 
-             }
-             $size = round($size, 2) .' '. $label;
-	     
-             $files[] = array('name' => $file, 'mime' => $mime, 'size' => $size, 'resolution' => $res, 'thumb' => ($thumbnail != FALSE));
-	      $i++;
-           } 
-         }
-       }
-     }    
+    $allowed_types = $cm->getMimetypes();
+    if (file_exists($path) && is_dir($path)) {
+      $dir = opendir($path);
+      for ($i = $start; $i < $end && ($file = readdir($dir)) !== FALSE;) {
+        if (is_file($path . $file)) {
+          $mime = $mimeClass->getType($path . $file);
+          if (in_array($mime, $allowed_types)) {
+
+            $thumbnail = FALSE;
+            //executes ingest rules with the "preview" parameter set.
+            if ($cm->execIngestRules($path . $file, $mime, TRUE) && isset($_SESSION['fedora_ingest_files']['TN']) && file_exists($_SESSION['fedora_ingest_files']['TN'])) {
+              $thumbnail = $_SESSION['fedora_ingest_files']['TN'];
+              unset($_SESSION['fedora_ingest_files']['TN']);
+            }
+
+            $res_array = getimagesize($path . '/' . $file);
+            $res = '';
+            if (is_array($res_array)) {
+              $res = $res_array[0] . 'x' . $res_array[1];
+            }
+
+            $size = filesize($path . '/' . $file);
+            $labels = array('kB', 'MB', 'GB', 'TB');
+            $label = 'B';
+            while ($size > 1024) {
+              $size = $size / 1024;
+              $label = array_shift($labels);
+            }
+            $size = round($size, 2) . ' ' . $label;
+
+            $files[] = array('name' => $file, 'mime' => $mime, 'size' => $size, 'resolution' => $res, 'thumb' => ($thumbnail != FALSE));
+            $i++;
+          }
+        }
+      }
+    }
   }
-  usort($files,'ife_filechooser_cmp');
+  usort($files, 'ife_filechooser_cmp');
   echo json_encode($files);
-  
 }

form_elements/includes/people.inc

@@ -1,6 +1,5 @@
 <?php
 
-// $Id$
 
 // this is a bit of a hack.  It iterates through the 
 // form and assigns a dummy value to any field in the $post 
@@ -10,12 +9,12 @@
 function _dummy_post_info($form, $post, $key = '') {
   $children = element_children($form);
   if (count($children) > 0) {
-     foreach ($children as $key) {
-       $post = _dummy_post_info($form[$key], $post, $key);
+    foreach ($children as $key) {
+      $post = _dummy_post_info($form[$key], $post, $key);
     }
   }
-  if ($key!='' && isset($form['#required']) && $form['#required'] == TRUE && trim($post[$key]) == '') {
-   $post[$key] = 'not empty';
+  if ($key != '' && isset($form['#required']) && $form['#required'] == TRUE && trim($post[$key]) == '') {
+    $post[$key] = 'not empty';
   }
 
   return $post;
@@ -36,13 +35,12 @@ function _ife_find_people_element($form, &$keys = array()) {
   }
 
   return FALSE;
-
 }
 
 function ife_people_ahah() {
 
   if (!isset($_POST['form_build_id']))
-      return;
+    return;
 
   $form_state = array('storage' => NULL, 'submitted' => FALSE);
   $form_build_id = $_POST['form_build_id'];
@@ -59,7 +57,7 @@ function ife_people_ahah() {
   $form['#post'] = $_POST;
   drupal_process_form($form_id, $form, $form_state);
 
-   //ob_start();  echo '<pre>'; echo $_POST['form_build_id']."\n"; var_dump($form_state);   echo '</pre>';  $dump = ob_get_contents(); ob_end_clean();
+  //ob_start();  echo '<pre>'; echo $_POST['form_build_id']."\n"; var_dump($form_state);   echo '</pre>';  $dump = ob_get_contents(); ob_end_clean();
 
   $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
   $qt_form = _ife_find_people_element($form);
@@ -67,8 +65,8 @@ function ife_people_ahah() {
   unset($qt_form['#prefix'], $qt_form['#suffix']); // Prevent duplicate wrappers.
   $javascript = drupal_add_js(NULL, NULL, 'header');
   drupal_json(array(
-    'status'   => TRUE,
-    'data'     => $dump . theme('status_messages') . drupal_render($qt_form),
+    'status' => TRUE,
+    'data' => $dump . theme('status_messages') . drupal_render($qt_form),
     'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']),
   ));
 }
@@ -81,7 +79,7 @@ function ife_remove_person_submit($form, &$form_state) {
   // Get the tab delta for the clicked button.
   $delta = $form_state['clicked_button']['#parents'][2];
 
-  $keys=array();
+  $keys = array();
   $qt_form = _ife_find_people_element($form, $keys);
 
   $peopleVals = &$form_state['values'];
@@ -110,7 +108,6 @@ function ife_remove_person_submit($form, &$form_state) {
   $form_state['rebuild'] = TRUE;
 }
 
-
 /**
  * Submit handler for the "Add Person" button.
  */
@@ -127,16 +124,16 @@ function ife_add_person_submit($form, &$form_state) {
     }
   }
   if (!is_array($peopleVals['people']))
-      $peopleVals['people'] = array();
+    $peopleVals['people'] = array();
 
   foreach ($peopleVals['people'] as $val) {
     $people[] = $val;
   }
 
   //only add new person if we are not adding from repository.
-	$elName = isset($qt_form['entity0']['#parents'][0])?$qt_form['entity0']['#parents'][0]:null;
-  if ($elName == null || !isset($form_state['clicked_button']['#post'][$elName]['add_from_repository']) || trim($form_state['clicked_button']['#post'][$elName]['add_from_repository']) == '') {
-    $people[] = array('name' => '', 'date'=>'',  'role' => '', 'subject' => '');
+  $elName = isset($qt_form['entity0']['#parents'][0]) ? $qt_form['entity0']['#parents'][0] : NULL;
+  if ($elName == NULL || !isset($form_state['clicked_button']['#post'][$elName]['add_from_repository']) || trim($form_state['clicked_button']['#post'][$elName]['add_from_repository']) == '') {
+    $people[] = array('name' => '', 'date' => '', 'role' => '', 'subject' => '');
   }
   unset($form_state['submit_handlers']);
   form_execute_handlers('submit', $form, $form_state);
@@ -144,8 +141,6 @@ function ife_add_person_submit($form, &$form_state) {
   $form_state['rebuild'] = TRUE;
 }
 
-
-
 /**
  * Submit handler for the "Add Person" button.
  */
@@ -163,10 +158,10 @@ function ife_add_org_submit($form, &$form_state) {
   }
 
   if (!is_array($peopleVals['people']))
-      $peopleVals['people'] = array();
+    $peopleVals['people'] = array();
 
   foreach ($peopleVals['people'] as $val) {
-    $people[]=$val;
+    $people[] = $val;
   }
   $people[] = array('role' => '', 'organization' => '');
 
@@ -176,24 +171,22 @@ function ife_add_org_submit($form, &$form_state) {
   //$form_state['rebuild'] = TRUE;
 }
 
-
-
 /**
  * Submit handler for the "Add Person" button.
  */
 function ife_add_conf_submit($form, &$form_state) {
   $people = array();
-  $keys=array();
+  $keys = array();
   $qt_form = _ife_find_people_element($form, $keys);
   $peopleVals = &$form_state['values'];
   while (count($keys) > 0) {
     $key = array_pop($keys);
     if (isset($peopleVals[$key])) {
-      $peopleVals=&$peopleVals[$key];
+      $peopleVals = &$peopleVals[$key];
     }
   }
   if (!is_array($peopleVals['people']))
-      $peopleVals['people'] = array();
+    $peopleVals['people'] = array();
 
   foreach ($peopleVals['people'] as $val) {
     $people[] = $val;
@@ -207,11 +200,9 @@ function ife_add_conf_submit($form, &$form_state) {
   //$form_state['rebuild'] = TRUE;
 }
 
-
-
 function theme_people($element) {
-    drupal_add_js(drupal_get_path('module', 'islandora_form_elements') .'/js/people_ahah.js');
-    if (!empty($element['#collapsible'])) {
+  drupal_add_js(drupal_get_path('module', 'islandora_form_elements') . '/js/people_ahah.js');
+  if (!empty($element['#collapsible'])) {
     drupal_add_js('misc/collapse.js');
 
     if (!isset($element['#attributes']['class'])) {
@@ -223,10 +214,9 @@ function theme_people($element) {
       $element['#attributes']['class'] .= ' collapsed';
     }
   }
-   return '<fieldset'. drupal_attributes($element['#attributes']) .'>'. ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . "</fieldset>\n";
+  return '<fieldset' . drupal_attributes($element['#attributes']) . '>' . ($element['#title'] ? '<legend>' . $element['#title'] . '</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">' . $element['#description'] . '</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . "</fieldset>\n";
 }
 
-
 function theme_people_items($form) {
   $rows = array();
   $headers = array(
@@ -241,9 +231,9 @@ function theme_people_items($form) {
       // Build the table row.
       $row = array(
         'data' => array(
-           array('data' => drupal_render($form[$key]['organization']), 'class' => 'ife-person-name container-inline'),
-           array('data' => drupal_render($form[$key]['role']).drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
-           array('data' => drupal_render($form[$key]['remove']), 'class' => 'ife-person-remove'),
+          array('data' => drupal_render($form[$key]['organization']), 'class' => 'ife-person-name container-inline'),
+          array('data' => drupal_render($form[$key]['role']) . drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
+          array('data' => drupal_render($form[$key]['remove']), 'class' => 'ife-person-remove'),
         ),
       );
     }
@@ -252,10 +242,10 @@ function theme_people_items($form) {
       // Build the table row.
       $row = array(
         'data' => array(
-          array('data' => drupal_render($form[$key]['conference']).'<br clear="all"/>'. drupal_render($form[$key]['date']), 'class' => 'ife-person-name container-inline' ),
-          array('data' => drupal_render($form[$key]['role']).drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
+          array('data' => drupal_render($form[$key]['conference']) . '<br clear="all"/>' . drupal_render($form[$key]['date']), 'class' => 'ife-person-name container-inline'),
+          array('data' => drupal_render($form[$key]['role']) . drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
           array('data' => drupal_render($form[$key]['remove']), 'class' => 'ife-person-remove'),
-         ),
+        ),
       );
     }
     else {
@@ -263,10 +253,10 @@ function theme_people_items($form) {
       // Build the table row.
       $row = array(
         'data' => array(
-          array('data' => drupal_render($form[$key]['name']) .'<br clear="all"/>'. drupal_render($form[$key]['date']), 'class' => 'ife-person-name container-inline'),
-          array('data' => drupal_render($form[$key]['role']).drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
+          array('data' => drupal_render($form[$key]['name']) . '<br clear="all"/>' . drupal_render($form[$key]['date']), 'class' => 'ife-person-name container-inline'),
+          array('data' => drupal_render($form[$key]['role']) . drupal_render($form[$key]['subject']), 'class' => 'ife-person-role'),
           array('data' => drupal_render($form[$key]['remove']), 'class' => 'ife-person-remove'),
-         ),
+        ),
       );
     }
 
@@ -281,8 +271,7 @@ function theme_people_items($form) {
   $output .= drupal_render($form);
 
   // Add our JS file, which has some Drupal core JS overrides, and ensures ahah behaviours get re-attached
-  drupal_add_css(drupal_get_path('module', 'islandora_form_elements') .'/css/people.css');
+  drupal_add_css(drupal_get_path('module', 'islandora_form_elements') . '/css/people.css');
   return $output;
 }
 
-

form_elements/js/copyright.js

@@ -1,48 +1,102 @@
 $(document).ready(function () { 
   
-  var cc_versions = new Array(); cc_versions[""]="3.0"; cc_versions["ar"]="2.5"; cc_versions["au"]="3.0"; cc_versions["at"]="3.0"; cc_versions["be"]="2.0"; cc_versions["br"]="3.0"; cc_versions["bg"]="2.5"; cc_versions["ca"]="2.5"; cc_versions["cl"]="2.0"; cc_versions["cn"]="2.5"; cc_versions["co"]="2.5"; cc_versions["hr"]="3.0"; cc_versions["cz"]="3.0"; cc_versions["dk"]="2.5"; cc_versions["ec"]="3.0"; cc_versions["fi"]="1.0"; cc_versions["fr"]="2.0"; cc_versions["de"]="3.0"; cc_versions["gr"]="3.0"; cc_versions["gt"]="3.0"; cc_versions["hk"]="3.0"; cc_versions["hu"]="2.5"; cc_versions["in"]="2.5"; cc_versions["il"]="2.5"; cc_versions["it"]="2.5"; cc_versions["jp"]="2.0"; cc_versions["kr"]="2.0"; cc_versions["lu"]="3.0"; cc_versions["mk"]="2.5"; cc_versions["my"]="2.5"; cc_versions["mt"]="2.5"; cc_versions["mx"]="2.5"; cc_versions["nl"]="3.0"; cc_versions["nz"]="3.0"; cc_versions["no"]="3.0"; cc_versions["pe"]="2.5"; cc_versions["ph"]="3.0"; cc_versions["pl"]="3.0"; cc_versions["pt"]="2.5"; cc_versions["pr"]="3.0"; cc_versions["ro"]="3.0"; cc_versions["rs"]="3.0"; cc_versions["sg"]="3.0"; cc_versions["si"]="2.5"; cc_versions["za"]="2.5"; cc_versions["es"]="3.0"; cc_versions["se"]="2.5"; cc_versions["ch"]="2.5"; cc_versions["tw"]="3.0"; cc_versions["th"]="3.0"; cc_versions["uk"]="2.0"; cc_versions["scotland"]="2.5"; cc_versions["us"]="3.0"; cc_versions["vn"]="3.0";
+    var cc_versions = new Array();
+    cc_versions[""]="3.0";
+    cc_versions["ar"]="2.5";
+    cc_versions["au"]="3.0";
+    cc_versions["at"]="3.0";
+    cc_versions["be"]="2.0";
+    cc_versions["br"]="3.0";
+    cc_versions["bg"]="2.5";
+    cc_versions["ca"]="2.5";
+    cc_versions["cl"]="2.0";
+    cc_versions["cn"]="2.5";
+    cc_versions["co"]="2.5";
+    cc_versions["hr"]="3.0";
+    cc_versions["cz"]="3.0";
+    cc_versions["dk"]="2.5";
+    cc_versions["ec"]="3.0";
+    cc_versions["fi"]="1.0";
+    cc_versions["fr"]="2.0";
+    cc_versions["de"]="3.0";
+    cc_versions["gr"]="3.0";
+    cc_versions["gt"]="3.0";
+    cc_versions["hk"]="3.0";
+    cc_versions["hu"]="2.5";
+    cc_versions["in"]="2.5";
+    cc_versions["il"]="2.5";
+    cc_versions["it"]="2.5";
+    cc_versions["jp"]="2.0";
+    cc_versions["kr"]="2.0";
+    cc_versions["lu"]="3.0";
+    cc_versions["mk"]="2.5";
+    cc_versions["my"]="2.5";
+    cc_versions["mt"]="2.5";
+    cc_versions["mx"]="2.5";
+    cc_versions["nl"]="3.0";
+    cc_versions["nz"]="3.0";
+    cc_versions["no"]="3.0";
+    cc_versions["pe"]="2.5";
+    cc_versions["ph"]="3.0";
+    cc_versions["pl"]="3.0";
+    cc_versions["pt"]="2.5";
+    cc_versions["pr"]="3.0";
+    cc_versions["ro"]="3.0";
+    cc_versions["rs"]="3.0";
+    cc_versions["sg"]="3.0";
+    cc_versions["si"]="2.5";
+    cc_versions["za"]="2.5";
+    cc_versions["es"]="3.0";
+    cc_versions["se"]="2.5";
+    cc_versions["ch"]="2.5";
+    cc_versions["tw"]="3.0";
+    cc_versions["th"]="3.0";
+    cc_versions["uk"]="2.0";
+    cc_versions["scotland"]="2.5";
+    cc_versions["us"]="3.0";
+    cc_versions["vn"]="3.0";
                                  
-  function updateCCPreview()
-  {
+    function updateCCPreview()
+    {
    
-    var commercial = $('.cc_commercial').val();
-    var modification = $('.cc_modifications').val();
-    var jurisdiction= $('.cc_jurisdiction').val();
-    var jurisdiction_name = jurisdiction;
-    var version = cc_versions[jurisdiction_name];
+        var commercial = $('.cc_commercial').val();
+        var modification = $('.cc_modifications').val();
+        var jurisdiction= $('.cc_jurisdiction').val();
+        var jurisdiction_name = jurisdiction;
+        var version = cc_versions[jurisdiction_name];
     
-    var params="";
+        var params="";
 
-    if (commercial != '')
-      params+="-"+commercial;    
-    if (modification != '')
-      params+="-"+modification;
+        if (commercial != '')
+            params+="-"+commercial;
+        if (modification != '')
+            params+="-"+modification;
     
     
-    if (jurisdiction != null)
-      jurisdiction+="/";
-    else
-    {
-      jurisdiction = "";
-      jurisdiction_name = "";
-    }
+        if (jurisdiction != null)
+            jurisdiction+="/";
+        else
+        {
+            jurisdiction = "";
+            jurisdiction_name = "";
+        }
     
-    var html  = "<a rel=\"license\" target=\"_new\" href=\"http://creativecommons.org/licenses/by"+params+"/"+version+"/"+jurisdiction+"\"><img alt=\"Creative Commons License\" style=\"border-width:0\" src=\"http://i.creativecommons.org/l/by"+params+"/"+version+"/"+jurisdiction+"88x31.png\" /></a><br />This work is licensed under a <a rel=\"license\" href=\"http://creativecommons.org/licenses/by"+params+"/"+version+"/"+jurisdiction+"\">Creative Commons License</a>.";
+        var html  = "<a rel=\"license\" target=\"_new\" href=\"http://creativecommons.org/licenses/by"+params+"/"+version+"/"+jurisdiction+"\"><img alt=\"Creative Commons License\" style=\"border-width:0\" src=\"http://i.creativecommons.org/l/by"+params+"/"+version+"/"+jurisdiction+"88x31.png\" /></a><br />This work is licensed under a <a rel=\"license\" href=\"http://creativecommons.org/licenses/by"+params+"/"+version+"/"+jurisdiction+"\">Creative Commons License</a>.";
     
-    $('.cc_preview').html(html);
-  }
+        $('.cc_preview').html(html);
+    }
   
-  $('.cc_enable').change(function () { 
-    $('.cc_field').attr('disabled', !$(this).attr('checked'));
-    if ($(this).attr('checked'))
-      updateCCPreview();
-    else
-      $('.cc_preview').html('');
-  });
+    $('.cc_enable').change(function () {
+        $('.cc_field').attr('disabled', !$(this).attr('checked'));
+        if ($(this).attr('checked'))
+            updateCCPreview();
+        else
+            $('.cc_preview').html('');
+    });
 
-  $('.cc_field').change(function () { 
-    updateCCPreview();
-  });
+    $('.cc_field').change(function () {
+        updateCCPreview();
+    });
   
-  updateCCPreview();
+    updateCCPreview();
 });

form_elements/js/filechooser.js

@@ -13,7 +13,7 @@ $(document).ready(function () {
     
     if ($('#fileField').attr('value') != '')
     {
-      selectedValue  = $('#fileField').attr('value');
+        selectedValue  = $('#fileField').attr('value');
     }
   
     cp_pid = $('#edit-collection-pid').attr('value');
@@ -21,66 +21,66 @@ $(document).ready(function () {
     $.getJSON("/filechooser/generatePreview/"+cp_pid+"/"+cm_pid+"?start="+start+"&end="+end,function (data)
     {
      
-      $('#fileList').html('');
-      if (data.length == 0)
-      {
-	$('#fileList').append('<div>No files found in staging area.<div>');
-	
-      } else
-      {
-	$.each(data, function(i, item)
-	{
-	  var html;
-	  files[i]=item.name;
-	  var selected= "";
-	  if (selectedValue == item.name)
-	  {
-	    selected='class="selected"';
-	    selectedFile='file'+i;
-	    selectedIndex=i - (i%visibleFiles);
-	  }
-	  
-	  if (item.thumb)
-	  {
-	    html='<li id="file'+i+'"'+selected+'><img src="/filechooser/getThumbnail/'+cp_pid+'/'+cm_pid+'/'+item.name+'" class="thumbnail"><div style="width:150px">'+item.name+'<br>'+item.mime+'<br>'+item.size+'&nbsp;&nbsp;'+item.resolution+'</div></li>';
-	  } else
-	  {
-	    var type=item.mime.split('/',1).shift();
-	    html='<li id="file'+i+'"'+selected+'><div class="'+type+'placeholder">&nbsp;</div><div class="breakly">'+item.name+'<br>'+item.mime+'<br>'+item.size+'</div></li>';
-	  }
-	  
-	  $('#fileList').append(html);
-	});
-	
- 	  $('#fileList li div').breakly(15);
-	  
-      }
-      
-      
-      $(".carousel .jCarouselLite").jCarouselLite({
-      btnNext: ".carousel .next",
-      btnPrev: ".carousel .prev",
-      mouseWheel: true,
-      circular: false,
-      speed: 750,
-      visible: visibleFiles,
-      scroll: visibleFiles,
-      initial: selectedIndex
-      });
-      
-      $(".carousel li").click(function() {
-
-	  if (selectedFile != this.id)
-	  {
-	    $('#fileField').attr('value',files[this.id.split('file',2).pop()]);
-	    $("#"+(this.id)).addClass('selected');
-	    if (selectedFile != null)
-	    {
-	      $("#"+selectedFile).removeClass('selected');
-	    }
-	    selectedFile=this.id;
-	  }
-      })      
+        $('#fileList').html('');
+        if (data.length == 0)
+        {
+            $('#fileList').append('<div>No files found in staging area.<div>');
+	
+        } else
+{
+            $.each(data, function(i, item)
+            {
+                var html;
+                files[i]=item.name;
+                var selected= "";
+                if (selectedValue == item.name)
+                {
+                    selected='class="selected"';
+                    selectedFile='file'+i;
+                    selectedIndex=i - (i%visibleFiles);
+                }
+	  
+                if (item.thumb)
+                {
+                    html='<li id="file'+i+'"'+selected+'><img src="/filechooser/getThumbnail/'+cp_pid+'/'+cm_pid+'/'+item.name+'" class="thumbnail"><div style="width:150px">'+item.name+'<br>'+item.mime+'<br>'+item.size+'&nbsp;&nbsp;'+item.resolution+'</div></li>';
+                } else
+{
+                    var type=item.mime.split('/',1).shift();
+                    html='<li id="file'+i+'"'+selected+'><div class="'+type+'placeholder">&nbsp;</div><div class="breakly">'+item.name+'<br>'+item.mime+'<br>'+item.size+'</div></li>';
+                }
+	  
+                $('#fileList').append(html);
+            });
+	
+            $('#fileList li div').breakly(15);
+	  
+        }
+      
+      
+        $(".carousel .jCarouselLite").jCarouselLite({
+            btnNext: ".carousel .next",
+            btnPrev: ".carousel .prev",
+            mouseWheel: true,
+            circular: false,
+            speed: 750,
+            visible: visibleFiles,
+            scroll: visibleFiles,
+            initial: selectedIndex
+        });
+      
+        $(".carousel li").click(function() {
+
+            if (selectedFile != this.id)
+            {
+                $('#fileField').attr('value',files[this.id.split('file',2).pop()]);
+                $("#"+(this.id)).addClass('selected');
+                if (selectedFile != null)
+                {
+                    $("#"+selectedFile).removeClass('selected');
+                }
+                selectedFile=this.id;
+            }
+        })
       
     });