dor-services 2.2.4 → 4.4.10

data/lib/gsearch/demoFoxmlToSolr.xslt

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <!-- $Id: demoFoxmlToLucene.xslt 5734 2006-11-28 11:20:15Z gertsp $ -->
-<xsl:stylesheet exclude-result-prefixes="exts" version="1.0"
+<xsl:stylesheet version="1.0"
+	exclude-result-prefixes="dc dt ex exts fedora-model fedora-types fn foxml hydra oai_dc rdf rel uvalibadmin uvalibdesc xsl" 
 	xmlns:dc="http://purl.org/dc/elements/1.1/"
 	xmlns:exts="xalan://dk.defxws.fedoragsearch.server.GenericOperationsImpl"
+	xmlns:ex="http://exslt.org/common"
+	xmlns:dt="http://exslt.org/dates-and-times"
 	xmlns:fedora-model="info:fedora/fedora-system:def/model#"
 	xmlns:fedora-types="http://www.fedora.info/definitions/1/0/types/"
-	xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:mods="http://www.loc.gov/mods/v3"
-	xmlns:hydra="http://projecthydra.org/ns/relations#"
+	xmlns:fn="http://www.w3.org/TR/xpath-functions/"
+	xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+	xmlns:hydra="http://projecthydra.org/ns/relations#" xmlns:mods="http://www.loc.gov/mods/v3"
 	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:rel="info:fedora/fedora-system:def/relations-external#"
 	xmlns:uvalibadmin="http://dl.lib.virginia.edu/bin/admin/admin.dtd/"
 	xmlns:uvalibdesc="http://dl.lib.virginia.edu/bin/dtd/descmeta/descmeta.dtd"
-	xmlns:fn="http://www.w3.org/TR/xpath-functions/"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:zs="http://www.loc.gov/zing/srw/">
 	<xsl:output encoding="UTF-8" indent="yes" method="xml"/>
 	<!--
@@ -21,27 +24,42 @@
      Options for tailoring:
        - generation of fields from other XML metadata streams than DC
        - generation of fields from other datastream types than XML
-         - from datastream by ID, text fetched, if mimetype can be handled
-             currently the mimetypes text/plain, text/xml, text/html, application/pdf can be handled.
--->
+       - from datastream by ID, text fetched, if mimetype can be handled
+         currently the mimetypes text/plain, text/xml, text/html, application/pdf can be handled.
+	-->
+	<xsl:variable name="INDEXVERSION">2.2.0</xsl:variable>
+	
+	<xsl:param name="INCLUDE_EXTERNALS" select="true()"/>
 	<xsl:param name="REPOSITORYNAME" select="repositoryName"/>
 	<xsl:param name="FEDORASOAP" select="repositoryName"/>
 	<xsl:param name="FEDORAUSER" select="repositoryName"/>
 	<xsl:param name="FEDORAPASS" select="repositoryName"/>
 	<xsl:param name="TRUSTSTOREPATH" select="repositoryName"/>
 	<xsl:param name="TRUSTSTOREPASS" select="repositoryName"/>
-  <xsl:variable name="scheme" select="substring-before($FEDORASOAP,'//')"/>
-  <xsl:variable name="path" select="substring-before(substring-after($FEDORASOAP,'//'),'/services')"/>
-	<xsl:variable name="FEDORAROOT">
-	  <xsl:value-of select="concat($scheme,'//',$FEDORAUSER,':',$FEDORAPASS,'@',$path)"/>
-	</xsl:variable>
 	<xsl:variable name="PID" select="/foxml:digitalObject/@PID"/>
 	<xsl:variable name="docBoost" select="1.4*2.5"/>
+	<xsl:variable name="OBJECTTYPE"
+		select="//foxml:datastream/foxml:datastreamVersion[last()]//identityMetadata/objectType/text()"/>
+	<xsl:variable name="first-workflow-url">
+		<xsl:value-of select="//foxml:contentLocation[@TYPE='URL' and contains(@REF, 'workflow/dor/objects')]/@REF"/>
+	</xsl:variable>
+	<xsl:variable name="workflow-stem">
+		<xsl:value-of select="substring-before($first-workflow-url, $PID)"/>
+	</xsl:variable>
+	<xsl:variable name="DATASTREAM_LIST">
+		<ds name="RELS-EXT"/>
+		<ds name="DC"/>
+		<ds name="identityMetadata"/>
+		<ds name="descMetadata"/>
+		<ds name="embargoMetadata"/>
+		<ds name="administrativeMetadata"/>
+		<ds name="roleMetadata"/>
+		<ds name="contentMetadata"/>
+		<ds name="rightsMetadata"/>
+		<ds name="workflows"/>
+		<!--<ds match="WF"/>-->
+	</xsl:variable>
 	
-	<xsl:variable name="OBJECTTYPE" select="//foxml:datastream/foxml:datastreamVersion[last()]//identityMetadata/objectType/text()"/>
-
-  <xsl:variable name="INDEXVERSION">1.3.2011102001</xsl:variable>
-
 	<!-- or any other calculation, default boost is 1.0 -->
 	<xsl:template match="/">
 		<add>
@@ -50,7 +68,7 @@
 			</doc>
 		</add>
 	</xsl:template>
-	
+
 	<xsl:template match="/foxml:digitalObject">
 		<field name="index_version_field">
 			<xsl:value-of select="$INDEXVERSION"/>
@@ -66,64 +84,111 @@
 		</field>
 		<field name="link_text_display">
 			<xsl:choose>
-				<xsl:when test="//dc:title"><xsl:value-of select="//dc:title/text()"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$PID"/></xsl:otherwise>
+				<xsl:when test="//dc:title">
+					<xsl:value-of select="//dc:title/text()"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$PID"/>
+				</xsl:otherwise>
 			</xsl:choose>
 		</field>
+		<xsl:call-template name="lifecycle"/>
 		<xsl:apply-templates select="*"/>
+		<xsl:call-template name="workflows"/>
 	</xsl:template>
 	
 	<xsl:template match="foxml:objectProperties/foxml:property">
-			<field>
-				<xsl:attribute name="name">
-					<!-- if this is a data field, append with date, otherwise field -->
-					<xsl:choose>
-						<xsl:when test="contains(@NAME, 'Date')">
-							<xsl:value-of
-								select="concat('fgs_', substring-after(@NAME,'#'), '_date')"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of
-								select="concat('fgs_', substring-after(@NAME,'#'), '_field')"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<xsl:value-of select="@VALUE"/>
-			</field>
+		<field>
+			<xsl:attribute name="name">
+				<!-- if this is a data field, append with date, otherwise field -->
+				<xsl:choose>
+					<xsl:when test="contains(@NAME, 'Date')">
+						<xsl:value-of select="concat('fgs_', substring-after(@NAME,'#'), '_date')"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat('fgs_', substring-after(@NAME,'#'), '_field')"
+						/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:value-of select="@VALUE"/>
+		</field>
 	</xsl:template>
 
 	<xsl:template match="foxml:datastream">
-<!--
-		<field name="fedora_datastream_id_field">
-			<xsl:value-of select="@ID"/>
+		<field name="fedora_datastream_version_field">
+			<xsl:value-of select="foxml:datastreamVersion[last()]/@ID"/>
 		</field>
--->
-		<xsl:apply-templates select="./foxml:datastreamVersion[last()]/foxml:xmlContent"/>
-		<xsl:apply-templates select="./foxml:datastreamVersion[last()]/foxml:contentLocation"/>
+		<xsl:apply-templates select="foxml:datastreamVersion[last()]"/>		
+	</xsl:template>
+	
+	<!-- Index inline datastreams -->
+	<xsl:template match="foxml:datastream[foxml:datastreamVersion/foxml:xmlContent]/foxml:datastreamVersion[last()]">
+		<xsl:variable name="datastream-name" select="../@ID"/>
+		<xsl:apply-templates select="foxml:xmlContent/*">
+			<xsl:with-param name="datastream-name" select="$datastream-name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+	
+	<!-- Index managed/external datastreams -->
+	<xsl:template match="foxml:datastream[foxml:datastreamVersion/foxml:contentLocation]/foxml:datastreamVersion[last()]">
+		<xsl:if test="$INCLUDE_EXTERNALS">
+			<xsl:variable name="ds" select="."/>
+			<xsl:call-template name="process-datastream">
+				<xsl:with-param name="ds" select="$ds"/>
+				<xsl:with-param name="datastreams" select="ex:node-set($DATASTREAM_LIST)"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="process-datastream">
+		<xsl:param name="ds"/>
+		<xsl:param name="datastreams"/>
+		<xsl:variable name="datastream-name" select="$ds/../@ID"/>
+		<xsl:variable name="datastream-ts" select="$ds/@CREATED"/>
+		<xsl:variable name="content-location" select="$ds/foxml:contentLocation/@REF"/>
+		<xsl:for-each select="$datastreams/*">
+			<xsl:if test="(@name and (@name = $datastream-name)) or (@match and contains($datastream-name,@match))">
+				<xsl:variable name="content-uri">
+					<xsl:choose>
+						<xsl:when test="contains($content-location, '/fedora/get/')">http://localhost:8080/fedora/<xsl:value-of select="substring-after($content-location,'/fedora/')"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$content-location"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:message>Retrieving <xsl:value-of select="$content-uri"/></xsl:message>
+				<xsl:apply-templates select="document($content-uri)/*">
+					<xsl:with-param name="datastream-name" select="$datastream-name"/>
+				</xsl:apply-templates>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:template>
+
+	<xsl:template name="workflows">
+		<xsl:variable name="combined-workflow-stream" select="document(concat($workflow-stem,$PID,'/workflows'))"/>
+		<xsl:apply-templates select="$combined-workflow-stream/workflows/workflow"/>
+	</xsl:template>
+	
 	<!-- Index RELS-EXT -->
-	<xsl:template match="rdf:RDF[ancestor::foxml:datastream[@ID='RELS-EXT']]/rdf:Description">
+	<xsl:template match="rdf:RDF/rdf:Description">
 		<!-- Grab the cmodel -->
 		<xsl:for-each select="./fedora-model:hasModel">
 			<field name="fedora_has_model_field">
 				<xsl:value-of select="@rdf:resource"/>
 			</field>
 		</xsl:for-each>
-		
 		<xsl:for-each select="*[@rdf:resource]">
-  		<xsl:variable name="doc-pid" select="substring-after(./@rdf:resource,'info:fedora/')"></xsl:variable>
-  		<field name="{local-name(.)}_id_field">
-  			<xsl:value-of select="$doc-pid"/>
-  		</field>
-  		<field name="{local-name(.)}_id_facet">
-  			<xsl:value-of select="$doc-pid"/>
-  		</field>
-	  </xsl:for-each>
+			<xsl:variable name="doc-pid" select="substring-after(./@rdf:resource,'info:fedora/')"/>
+			<field name="{local-name(.)}_id_field">
+				<xsl:value-of select="$doc-pid"/>
+			</field>
+			<field name="{local-name(.)}_id_facet">
+				<xsl:value-of select="$doc-pid"/>
+			</field>
+		</xsl:for-each>
 	</xsl:template>
 
 	<!-- Index DC -->
-	<xsl:template match="oai_dc:dc[ancestor::foxml:datastream[@ID='DC']]">
+	<xsl:template match="oai_dc:dc">
 		<xsl:for-each select="dc:title|dc:creator|dc:identifier">
 			<field name="dc_{local-name(.)}_text">
 				<xsl:value-of select="text()"/>
@@ -135,9 +200,11 @@
 			</field>
 		</xsl:for-each>
 	</xsl:template>
+
 	
+
 	<!-- Index identity metadata -->
-	<xsl:template match="identityMetadata[ancestor::foxml:datastream[@ID='identityMetadata']]">
+	<xsl:template match="identityMetadata">
 		<xsl:for-each select="./objectType">
 			<field name="object_type_field">
 				<xsl:value-of select="./text()"/>
@@ -148,7 +215,7 @@
 				<xsl:value-of select="concat(@source, ':', normalize-space(./text()))"/>
 			</field>
 			<field name="source_id_field">
-				<xsl:value-of select="normalize-space(./text())"/>
+				<xsl:value-of select="concat(@source, ':', normalize-space(./text()))"/>
 			</field>
 			<field name="identifier_text">
 				<xsl:value-of select="concat(@source, ':', normalize-space(./text()))"/>
@@ -177,7 +244,9 @@
 			<xsl:variable name="tag-name"
 				select="normalize-space(substring-before($text-value, ':'))"/>
 			<xsl:variable name="field-name">
-				<xsl:call-template name="valid-field-name"><xsl:with-param name="name" select="$tag-name"/></xsl:call-template>
+				<xsl:call-template name="valid-field-name">
+					<xsl:with-param name="name" select="$tag-name"/>
+				</xsl:call-template>
 				<xsl:text>_tag</xsl:text>
 			</xsl:variable>
 			<field name="{$field-name}_field">
@@ -188,13 +257,17 @@
 			</field>
 		</xsl:for-each>
 	</xsl:template>
-		
+	
 	<!-- Index MODS descriptive metadata -->
-	<xsl:template match="mods:mods[ancestor::foxml:datastream[@ID='descMetadata']]">
+	<xsl:template match="mods:mods">
+		<field name="metadata_format_field">mods</field>
+		<field name="metadata_format_facet">mods</field>
 		<!-- Grab the MODS identifiers -->
 		<xsl:for-each select="./mods:identifier">
 			<xsl:variable name="identifier-label">
-				<xsl:call-template name="valid-field-name"><xsl:with-param name="name" select="@displayLabel"/></xsl:call-template>
+				<xsl:call-template name="valid-field-name">
+					<xsl:with-param name="name" select="@displayLabel"/>
+				</xsl:call-template>
 			</xsl:variable>
 			<field name="mods_identifier_field">
 				<xsl:value-of select="@displayLabel"/>:<xsl:value-of select="text()"/>
@@ -209,15 +282,9 @@
 				<xsl:value-of select="text()"/>
 			</field>
 		</xsl:for-each>
-		
 		<xsl:for-each select="mods:titleInfo">
 			<xsl:variable name="title-info">
-				<xsl:value-of select="mods:nonSort/text()"/>
-				<xsl:value-of select="mods:title/text()"/>
-				<xsl:if test="mods:subTitle">
-					<xsl:text> : </xsl:text>
-					<xsl:value-of select="mods:subTitle/text()"/>
-				</xsl:if>
+				<xsl:call-template name="mods-title"/>
 			</xsl:variable>
 			<field name="mods_titleInfo_field">
 				<xsl:value-of select="$title-info"/>
@@ -226,16 +293,42 @@
 				<xsl:value-of select="$title-info"/>
 			</field>
 		</xsl:for-each>
-		
 		<xsl:for-each select="mods:name">
+			<xsl:variable name="name-info">
+				<xsl:call-template name="mods-name"/>
+			</xsl:variable>
 			<field name="mods_name_field">
-				<xsl:value-of select="mods:namePart/text()"/>
+				<xsl:value-of select="$name-info"/>
 			</field>
 			<field name="mods_name_text">
-				<xsl:value-of select="mods:namePart/text()"/>
+				<xsl:value-of select="$name-info"/>
+			</field>
+			<xsl:if test="mods:role/mods:roleTerm[@type='text']">
+				<xsl:variable name="role" select="mods:role/mods:roleTerm[@type='text']/text()"/>
+				<field name="mods_{$role}_field">
+					<xsl:value-of select="mods:namePart/text()"/>
+				</field>
+				<field name="mods_{$role}_text">
+					<xsl:value-of select="mods:namePart/text()"/>
+				</field>
+			</xsl:if>
+		</xsl:for-each>
+		<xsl:for-each select="mods:originInfo/mods:publisher">
+			<field name="mods_publisher_field">
+				<xsl:value-of select="text()"/>
+			</field>
+			<field name="mods_publisher_text">
+				<xsl:value-of select="text()"/>
+			</field>
+		</xsl:for-each>
+		<xsl:for-each select="mods:originInfo/mods:place/mods:placeTerm[@type='text']">
+			<field name="mods_origininfo_place_field">
+				<xsl:value-of select="text()"/>
+			</field>
+			<field name="mods_origininfo_place_text">
+				<xsl:value-of select="text()"/>
 			</field>
 		</xsl:for-each>
-		
 		<!-- Index some, but not all, MODS fields -->
 		<xsl:for-each select="//mods:coordinates|//mods:extent|//mods:scale|//mods:topic">
 			<xsl:if test="./text()">
@@ -244,83 +337,194 @@
 				</field>
 			</xsl:if>
 		</xsl:for-each>
-		
-		<xsl:for-each select="//mods:*[contains(local-name(),'date') or contains(local-name(), 'Date')]">
+		<xsl:for-each
+			select="//mods:*[contains(local-name(),'date') or contains(local-name(), 'Date')]">
 			<xsl:variable name="date-label">
-				<xsl:call-template name="valid-field-name"><xsl:with-param name="name" select="local-name()"/></xsl:call-template>
+				<xsl:call-template name="valid-field-name">
+					<xsl:with-param name="name" select="local-name()"/>
+				</xsl:call-template>
 			</xsl:variable>
 			<field name="mods_{$date-label}_field">
 				<xsl:value-of select="normalize-space(./text())"/>
 			</field>
 		</xsl:for-each>
-<!--
+		<!--
 		<xsl:for-each select=".//mods:*[string-length(normalize-space(text())) &gt; 0]">
 			<field name="mods_{local-name(.)}_field"><xsl:value-of select="normalize-space(./text())"/></field>
 		</xsl:for-each>
 -->
 	</xsl:template>
-	
-	<!-- Index content metadata -->
-	<xsl:template match="contentMetadata[ancestor::foxml:datastream[@ID='contentMetadata']]">
-	  <field name="content_type_facet">
-	    <xsl:value-of select="@type"/>
-	  </field>
-	  <xsl:apply-templates/>
-  </xsl:template>
-  
-  <xsl:template match="contentMetadata/resource/file">
-	  <field name="content_file_field">
-	    <xsl:value-of select="@id"/>
-	  </field>
-	  <xsl:if test="@shelve = 'yes'">
-  	  <field name="shelved_content_file_field">
-  	    <xsl:value-of select="@id"/>
-  	  </field>
-  	</xsl:if>
-  </xsl:template>
 
-  <!-- Index embargo metadata -->
-  <xsl:template match="embargoMetadata[ancestor::foxml:datastream[@ID='embargoMetadata']]">
-	<xsl:if	test="(status != '') and (releaseDate != '')">
-	  <field name="embargo_status_field">
-	    <xsl:value-of select="status"/>
-	  </field>
-  	  <field name="embargo_release_date">
-  	    <xsl:value-of select="releaseDate"/>
-  	  </field>
-    </xsl:if>
-  </xsl:template>
-  
-	<!-- Workflows -->
-	<xsl:template match="foxml:contentLocation[contains(@REF,'/workflows/')]">
-		<xsl:apply-templates select="document(@REF)/workflow">
-			<xsl:with-param name="workflow-name" select="ancestor::foxml:datastream/@ID"/>
+	<!-- mods-title and mods-name templates cribbed from mods2dc.xslt -->
+	<xsl:template name="mods-title">
+		<xsl:value-of select="mods:nonSort"/>
+		<xsl:if test="mods:nonSort">
+			
+			<xsl:text> </xsl:text>
+		</xsl:if>
+		<xsl:value-of select="mods:title"/>
+		<xsl:if test="mods:subTitle">
+			<xsl:text>: </xsl:text>
+			<xsl:value-of select="mods:subTitle"/>
+		</xsl:if>
+		<xsl:if test="mods:partNumber">
+			
+			<xsl:text>. </xsl:text>
+			<xsl:value-of select="mods:partNumber"/>
+		</xsl:if>
+		<xsl:if test="mods:partName">
+			<xsl:text>. </xsl:text>
+			<xsl:value-of select="mods:partName"/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="mods-name">
+		<xsl:variable name="name">
+			<xsl:for-each select="mods:namePart[not(@type)]">
+				<xsl:value-of select="."/>
+				
+				<xsl:text> </xsl:text>
+			</xsl:for-each>
+			<xsl:value-of select="mods:namePart[@type='family']"/>
+			<xsl:if test="mods:namePart[@type='given']">
+				<xsl:text>, </xsl:text>
+				<xsl:value-of select="mods:namePart[@type='given']"/>
+			</xsl:if>
+			<xsl:if test="mods:namePart[@type='date']">
+				
+				<xsl:text>, </xsl:text>
+				<xsl:value-of select="mods:namePart[@type='date']"/>
+				<xsl:text/>
+			</xsl:if>
+			<xsl:if test="mods:displayForm">
+				<xsl:text> (</xsl:text>
+				<xsl:value-of select="mods:displayForm"/>
+				
+				<xsl:text>) </xsl:text>
+			</xsl:if>
+			<xsl:for-each select="mods:role[mods:roleTerm[@type='text']!='creator']">
+				<xsl:text> (</xsl:text>
+				<xsl:value-of select="normalize-space(.)"/>
+				<xsl:text>) </xsl:text>
+			</xsl:for-each>
+			
+		</xsl:variable>
+		<xsl:value-of select="normalize-space($name)"/>
+	</xsl:template>
+
+	<!-- Index content metadata -->
+	<xsl:template match="contentMetadata">
+		<field name="content_type_facet">
+			<xsl:value-of select="@type"/>
+		</field>
+		<xsl:apply-templates select="./resource">
+			<xsl:sort data-type="number" select="@sequence"/>
 		</xsl:apply-templates>
 	</xsl:template>
+	<xsl:template match="contentMetadata/resource/file">
+		<field name="content_file_field">
+			<xsl:value-of select="@id"/>
+		</field>
+		<xsl:if test="@shelve = 'yes'">
+			<field name="shelved_content_file_field">
+				<xsl:value-of select="@id"/>
+			</field>
+		</xsl:if>
+	</xsl:template>
+	
+	<!-- Index rights metadata -->
+	<xsl:template match="rightsMetadata">
+		<xsl:if test="access[@type='read']/machine/embargoReleaseDate">
+			<field name="embargo_status_facet">embargoed</field>
+			<field name="embargo_status_field">embargoed</field>
+			<field name="embargo_release_date">
+				<xsl:call-template name="long-enough-date">
+					<xsl:with-param name="date" select="access[@type='read']/machine/embargoReleaseDate/text()"/>
+				</xsl:call-template>
+			</field>
+		</xsl:if>
+	</xsl:template>
+	
+	<!-- Index embargo metadata -->
+	<xsl:template match="embargoMetadata">
+		<xsl:if test="(status != '') and (releaseDate != '')">
+			<field name="embargo_status_facet">
+				<xsl:value-of select="status"/>
+			</field>
+			<field name="embargo_status_field">
+				<xsl:value-of select="status"/>
+			</field>
+			<field name="embargo_release_date">
+				<xsl:call-template name="long-enough-date">
+					<xsl:with-param name="date" select="releaseDate"/>
+				</xsl:call-template>
+			</field>
+		</xsl:if>
+	</xsl:template>
+	
+	<!-- Workflows -->
+	<xsl:template name="lifecycle">
+		<xsl:variable name="lifecycle-uri" select="concat($workflow-stem, $PID, '/lifecycle')"/>
+		<xsl:message>Retrieving <xsl:value-of select="$lifecycle-uri"/></xsl:message>
+		<xsl:variable name="doc" select="document($lifecycle-uri)"/>
+		<xsl:apply-templates select="$doc/*"/>
+	</xsl:template>
 
+	<xsl:template match="lifecycle">
+		<xsl:for-each select="milestone">
+			<xsl:variable name="zdate" select="concat(substring(@date,1,19),'Z')"/>
+			<field name="lifecycle_field">
+				<xsl:value-of select="text()"/>:<xsl:value-of select="$zdate"/>
+			</field>
+			<field>
+			  	<xsl:attribute name="name">
+			  		<xsl:value-of select="concat(text(),'_date')"/>
+			  	</xsl:attribute>
+				<xsl:value-of select="$zdate"/>
+			</field>
+			<xsl:if test="position() = last()">
+				<field name="lifecycle_facet">
+					<xsl:value-of select="text()"/>
+				</field>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:template>
+	
+	<xsl:template match="workflows">
+		<xsl:apply-templates select="./workflow"/>
+	</xsl:template>
+	
 	<xsl:template match="workflow">
-		<xsl:param name="workflow-name" select="ancestor::foxml:datastream/@ID"/>
+		<xsl:param name="datastream-name" select="@id | ancestor::foxml:datastream/@ID"/>
+		<xsl:variable name="workflow-name" select="$datastream-name"/>
 		<xsl:variable name="workflow-token">
-			<xsl:call-template name="valid-field-name"><xsl:with-param name="name" select="$workflow-name"/></xsl:call-template>
+			<xsl:call-template name="valid-field-name">
+				<xsl:with-param name="name" select="$workflow-name"/>
+			</xsl:call-template>
 		</xsl:variable>
-		<field name="wf_facet"><xsl:value-of select="$workflow-name"/></field>
-		<field name="wf_wsp_facet"><xsl:value-of select="$workflow-name"/></field>
-		<field name="wf_wps_facet"><xsl:value-of select="$workflow-name"/></field>
+		<field name="wf_facet">
+			<xsl:value-of select="$workflow-name"/>
+		</field>
+		<field name="wf_wsp_facet">
+			<xsl:value-of select="$workflow-name"/>
+		</field>
+		<field name="wf_wps_facet">
+			<xsl:value-of select="$workflow-name"/>
+		</field>
 		<xsl:for-each select="process">
+			<xsl:sort select="@datetime" data-type="text"/>				
 			<field name="wf_wsp_facet">
 				<xsl:value-of select="concat($workflow-name,':',@status)"/>
 			</field>
 			<field name="wf_wsp_facet">
 				<xsl:value-of select="concat($workflow-name,':',@status,':',@name)"/>
 			</field>
-			
 			<field name="wf_wps_facet">
 				<xsl:value-of select="concat($workflow-name,':',@name)"/>
 			</field>
 			<field name="wf_wps_facet">
 				<xsl:value-of select="concat($workflow-name,':',@name,':',@status)"/>
 			</field>
-
 			<field name="wf_swp_facet">
 				<xsl:value-of select="@status"/>
 			</field>
@@ -332,9 +536,9 @@
 			</field>
 		</xsl:for-each>
 	</xsl:template>
-
+	
 	<!-- Admin Policy specific fields -->
-	<xsl:template match="administrativeMetadata[ancestor::foxml:datastream[@ID='administrativeMetadata']]">
+	<xsl:template match="administrativeMetadata">
 		<xsl:if test="./descMetadata/format">
 			<field name="apo_metadata_format_field">
 				<xsl:value-of select="./descMetadata/format/text()"/>
@@ -345,17 +549,17 @@
 				<xsl:value-of select="./descMetadata/source/text()"/>
 			</field>
 		</xsl:if>
-		
 		<xsl:for-each select="registration/workflow">
 			<field name="apo_registration_workflow_field">
 				<xsl:value-of select="@id"/>
 			</field>
 		</xsl:for-each>
 	</xsl:template>
-
-	<xsl:template match="roleMetadata[ancestor::foxml:datastream[@ID='roleMetadata']]">
+	
+	<xsl:template match="roleMetadata">
 		<xsl:for-each select="./role/*">
-			<xsl:variable name="role_value"><xsl:value-of select="identifier/@type"/>:<xsl:value-of select="identifier/text()"/></xsl:variable>
+			<xsl:variable name="role_value"><xsl:value-of select="identifier/@type"/>:<xsl:value-of
+					select="identifier/text()"/></xsl:variable>
 			<field name="apo_role_{local-name(.)}_{../@type}_field">
 				<xsl:value-of select="$role_value"/>
 			</field>
@@ -375,10 +579,24 @@
 	
 	<!-- Utility Templates -->
 	<xsl:template match="text()|@*|processing-instruction()|comment()"/>
+
+	<xsl:template name="long-enough-date">
+		<xsl:param name="date"/>
+		<xsl:variable name="date-format" select="'0000-00-00T00:00:00Z'"/>
+		<xsl:choose>
+			<xsl:when test="string-length($date) &lt; string-length($date-format)">
+				<xsl:value-of select="$date"/><xsl:value-of select="substring($date-format,string-length($date)+1)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$date"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	
 	<xsl:template name="valid-field-name">
 		<xsl:param name="name"/>
-		<xsl:value-of select="translate($name,' ABCDEFGHIJKLMNOPQRSTUVWXYZ','_abcdefghijklmnopqrstuvwxyz')"/>
+		<xsl:value-of
+			select="translate($name,' ABCDEFGHIJKLMNOPQRSTUVWXYZ','_abcdefghijklmnopqrstuvwxyz')"/>
 	</xsl:template>
 	
 </xsl:stylesheet>