From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 24 Jun 2004 06:20:06 +0000 (+0000)
Subject: Updated stylesheets from Larry E. Dixson
X-Git-Tag: YAZPROXY.0.9~59
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=7c11e23949ceceabae1b8359afc5f4d8a6a1825a;p=yazproxy-moved-to-github.git

Updated stylesheets from Larry E. Dixson
---

diff --git a/etc/MARC21slim2MODS3.xsl b/etc/MARC21slim2MODS3.xsl
index bed89c1..9820e81 100644
--- a/etc/MARC21slim2MODS3.xsl
+++ b/etc/MARC21slim2MODS3.xsl
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	xmlns:marc="http://www.loc.gov/MARC21/slim" 
+<xsl:stylesheet version="1.0" 
 	xmlns="http://www.loc.gov/mods/v3" 
+	xmlns:xlink="http://www.w3.org/1999/xlink" 
+	xmlns:marc="http://www.loc.gov/MARC21/slim" 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
-	<xsl:include href="MARC21slimUtils.xsl"/>
-	<xsl:output method="xml" indent="yes"/>
+	<xsl:include href="http://www.loc.gov/marcxml/xslt/MARC21slimUtils.xsl"/>
+	<!--<xsl:include href="MARC21slimUtils.xsl"/>-->
+	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
 
 <!--
+Revision 2003/03/25 08:29 jrad
+
+Revision 1.6 various validation fixes 2004/02/20 ntra
 
 Revision 1.5  2003/10/02 16:18:58  ntra
 MODS2 to MODS3 updates, language unstacking and 
@@ -32,7 +37,7 @@ Added Log Comment
 				</modsCollection>
 			</xsl:when>
 			<xsl:otherwise>
-				<mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-0.xsd">
+				<mods version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-0.xsd">
 					<xsl:for-each select="marc:record">
 						<xsl:call-template name="marcRecord"/>
 					</xsl:for-each>
@@ -126,11 +131,12 @@ Added Log Comment
 					<xsl:call-template name="chopPunctuation">
 						<xsl:with-param name="chopString">
 							<xsl:call-template name="subfieldSelect">
-								<xsl:with-param name="codes">ab</xsl:with-param>
+								<xsl:with-param name="codes">a</xsl:with-param>
 							</xsl:call-template>
 						</xsl:with-param>
 					</xsl:call-template>
 				</title>
+				<xsl:call-template name="subtitle"/>				
 			</titleInfo>
 		</xsl:for-each>
 
@@ -140,12 +146,14 @@ Added Log Comment
 					<xsl:call-template name="chopPunctuation">
 						<xsl:with-param name="chopString">
 							<xsl:call-template name="subfieldSelect">
-								<!-- 1/04 removed $h -->
-								<xsl:with-param name="codes">ab</xsl:with-param>
+								<!-- 1/04 removed $h, b -->
+								<xsl:with-param name="codes">a</xsl:with-param>
 							</xsl:call-template>
 						</xsl:with-param>
 					</xsl:call-template>
 				</title>
+				<!-- 1/04 fix -->
+				<xsl:call-template name="subtitle"/>
 				<xsl:call-template name="part"/>
 			</titleInfo>
 		</xsl:for-each>
@@ -161,12 +169,13 @@ Added Log Comment
 					<xsl:call-template name="chopPunctuation">
 						<xsl:with-param name="chopString">
 							<xsl:call-template name="subfieldSelect">
-								<!-- 1/04 removed $h -->
-								<xsl:with-param name="codes">abf</xsl:with-param>
+								<!-- 1/04 removed $h, $b -->
+								<xsl:with-param name="codes">af</xsl:with-param>
 							</xsl:call-template>
 						</xsl:with-param>
 					</xsl:call-template>
 				</title>
+				<xsl:call-template name="subtitle"/>
 				<xsl:call-template name="part"/>
 			</titleInfo>
 		</xsl:for-each>
@@ -624,7 +633,7 @@ Added Log Comment
 				<place>
 					<placeTerm>
 						<xsl:attribute name="type">text</xsl:attribute>
-							<xsl:call-template name="chopPunctuation">
+							<xsl:call-template name="chopPunctuationFront">
 							<xsl:with-param name="chopString">
 								<xsl:call-template name="chopPunctuation">
 									<xsl:with-param name="chopString" select="."/>
@@ -657,6 +666,7 @@ Added Log Comment
 						<publisher>
 							<xsl:call-template name="chopPunctuation">
 								<xsl:with-param name="chopString" select="."/>
+								<xsl:with-param name="punctuation"><xsl:text>:,;/ </xsl:text></xsl:with-param>
 							</xsl:call-template>
 						</publisher>
 					</xsl:when>
@@ -784,14 +794,16 @@ Added Log Comment
 		</xsl:if>
 		
 		<xsl:for-each select="marc:datafield[@tag=041]">			
-			<xsl:variable name="langCodes">
+			
+<!--			<xsl:variable name="langCodes">			
 				<xsl:copy-of select="marc:subfield[@code='a'or @code='d' or @code='e' or @code='2']"/>
 			</xsl:variable>
-			
+			-->
+				<xsl:variable name="langCodes" select="marc:subfield[@code='a'or @code='d' or @code='e' or @code='2']"/>
+
 			<xsl:choose>
-				<xsl:when test="$langCodes/child::*[@code='2']='rfc3066'">
-					<xsl:call-template name="rfcLanguages">					
-						<xsl:with-param name="langCodes"><xsl:copy-of select="$langCodes"/></xsl:with-param>
+				<xsl:when test="marc:subfield[@code='2']='rfc3066'"><!-- not stacked but could be repeated -->
+					<xsl:call-template name="rfcLanguages">									
 						<xsl:with-param name="nodeNum"><xsl:value-of select="1"/></xsl:with-param>						
 						<xsl:with-param name="usedLanguages">
 							<xsl:text></xsl:text>
@@ -801,9 +813,9 @@ Added Log Comment
 						</xsl:with-param>
 					</xsl:call-template>
 				</xsl:when>
-				<xsl:otherwise>
+				<xsl:otherwise><!-- iso -->
 					<xsl:variable name="allLanguages">
-						<xsl:value-of select="$langCodes"/>
+						<xsl:copy-of select="$langCodes"/>
 					</xsl:variable>
 					<xsl:variable name="currentLanguage">
 						<xsl:value-of select="substring($allLanguages,1,3)"/>
@@ -817,7 +829,7 @@ Added Log Comment
 						</xsl:with-param>
 						<xsl:with-param name="usedLanguages">
 							<xsl:if test="$controlField008-35-37">
-								<xsl:value-of select="substring($controlField008,36,3)"/>
+								<xsl:value-of select="$controlField008-35-37"/>
 							</xsl:if>					
 						</xsl:with-param>
 					</xsl:call-template>
@@ -890,6 +902,10 @@ Added Log Comment
 					</xsl:call-template>
 				</form>		
 			</xsl:if>
+			<xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
+				<form><xsl:value-of select="."/></form>
+			</xsl:for-each>
+
 			<xsl:for-each select="marc:controlfield[@tag=007][substring(text(),1,1)='c']">
 				<xsl:choose>
 					<xsl:when test="substring(text(),14,1)='a'">
@@ -909,11 +925,7 @@ Added Log Comment
 					<xsl:value-of select="."/>
 				</internetMediaType>
 			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=256]/marc:subfield[@code='a']">
-				<form><xsl:value-of select="."/></form>
-			</xsl:for-each>
-
+			
 			<xsl:for-each select="marc:datafield[@tag=300]">
 				<extent>
 					<xsl:call-template name="subfieldSelect">
@@ -958,23 +970,24 @@ Added Log Comment
 		<xsl:if test="$typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM'">
 			<xsl:variable name="controlField008-22" select="substring($controlField008,23,1)"/>
 			<xsl:choose>
+				<!-- 01/04 fix -->
 				<xsl:when test="$controlField008-22='d'">
-					<targetAudience>adolescent</targetAudience>
+					<targetAudience authority='marctarget'>adolescent</targetAudience>
 				</xsl:when>
 				<xsl:when test="$controlField008-22='e'">
-					<targetAudience>adult</targetAudience>
+					<targetAudience authority='marctarget'>adult</targetAudience>
 				</xsl:when>
 				<xsl:when test="$controlField008-22='g'">
-					<targetAudience>general</targetAudience>
+					<targetAudience authority='marctarget'>general</targetAudience>
 				</xsl:when>
 				<xsl:when test="$controlField008-22='b' or $controlField008-22='c' or $controlField008-22='j'">
-					<targetAudience>juvenile</targetAudience>
+					<targetAudience authority='marctarget'>juvenile</targetAudience>
 				</xsl:when>
 				<xsl:when test="$controlField008-22='a'">
-					<targetAudience>preschool</targetAudience>
+					<targetAudience authority='marctarget'>preschool</targetAudience>
 				</xsl:when>
 				<xsl:when test="$controlField008-22='f'">
-					<targetAudience>specialized</targetAudience>
+					<targetAudience authority='marctarget'>specialized</targetAudience>
 				</xsl:when>
 			</xsl:choose>
 		</xsl:if>
@@ -1658,8 +1671,13 @@ Added Log Comment
 						<xsl:when test="@ind1=4">videorecording identifier</xsl:when>
 					</xsl:choose>
 				</xsl:attribute>
-				<xsl:call-template name="subfieldSelect">
-					<xsl:with-param name="codes">ab</xsl:with-param>
+				<xsl:call-template name="subfieldSelect">											
+					<xsl:with-param name="codes">
+						<xsl:choose>
+							<xsl:when test="@ind1=0">ba</xsl:when>		
+							<xsl:otherwise>ab</xsl:otherwise>
+						</xsl:choose>
+					</xsl:with-param>
 				</xsl:call-template>
 			</identifier>
 		</xsl:for-each>
@@ -1707,7 +1725,7 @@ Added Log Comment
 							</xsl:call-template>
 						</xsl:attribute>
 					</xsl:if>											
-					<xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u']),'http://hdl.loc.gov/')"/>
+					<xsl:value-of select="concat('hdl:',substring-after(marc:subfield[@code='u'],'http://hdl.loc.gov/'))"/>
 				</identifier>
 			</xsl:if>
 		</xsl:for-each>
@@ -1718,14 +1736,14 @@ Added Log Comment
 				<xsl:value-of select="marc:subfield[@code='a']"/>
 			</identifier>
 		</xsl:for-each>
-
+		<!-- 1/04 fix added $y -->
 		<xsl:for-each select="marc:datafield[@tag=856][marc:subfield[@code='u']]">
 			<location>
 				<url>				
-					<xsl:if test="marc:subfield[@code=3]">
+					<xsl:if test="marc:subfield[@code='y' or @code='3']">
 						<xsl:attribute name="displayLabel">
 							<xsl:call-template name="subfieldSelect">
-								<xsl:with-param name="codes">3</xsl:with-param>
+								<xsl:with-param name="codes">y3</xsl:with-param>
 							</xsl:call-template>
 						</xsl:attribute>
 					</xsl:if>								
@@ -2054,6 +2072,7 @@ Added Log Comment
 						<xsl:with-param name="codes">aq</xsl:with-param>
 					</xsl:call-template>
 				</xsl:with-param>
+				<xsl:with-param name="punctuation"><xsl:text>:,;/ </xsl:text></xsl:with-param>
 			</xsl:call-template>
 		</namePart>
 		<xsl:call-template name="termsOfAddress"/>
@@ -2411,6 +2430,22 @@ Added Log Comment
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="subtitle">
+		<xsl:if test="marc:subfield[@code='b']">
+			<subTitle>
+				<xsl:call-template name="chopPunctuation">
+					<xsl:with-param name="chopString">
+					<xsl:value-of select="marc:subfield[@code='b']"/>
+
+ 						<!--<xsl:call-template name="subfieldSelect">
+							<xsl:with-param name="codes">b</xsl:with-param>									
+						</xsl:call-template>-->
+					</xsl:with-param>
+				</xsl:call-template>
+			</subTitle>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="script">
 		<xsl:param name="scriptCode"/>
 		<xsl:attribute name="script">
@@ -2579,12 +2614,13 @@ Added Log Comment
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template name="rfcLanguages">		
-		<xsl:param name="langCodes"/>
+	<xsl:template name="rfcLanguages">				
 		<xsl:param name="nodeNum"/>		
 		<xsl:param name="usedLanguages"/>
 		<xsl:param name="controlField008-35-37"/>
-		<xsl:variable name="currentLanguage" select="$langCodes/child::*[position()=$nodeNum]/text()"/>
+	<!-- ??? xalan -->
+	
+	<xsl:variable name="currentLanguage" select="marc:subfield[position()=$nodeNum]/text()"/>		
 		<xsl:choose>
 			<xsl:when test="not($currentLanguage)"/>							
 			<xsl:when test="$currentLanguage!=$controlField008-35-37 and $currentLanguage!='rfc3066'">
@@ -2596,15 +2632,14 @@ Added Log Comment
 					</language>
 				</xsl:if>
 				<xsl:call-template name="rfcLanguages">
-					<xsl:with-param name="langCodes"><xsl:copy-of select="$langCodes"/></xsl:with-param>
+					<!-- ??? xalan -->
 					<xsl:with-param name="nodeNum"><xsl:value-of select="$nodeNum+1"/></xsl:with-param>						
-					<xsl:with-param name="usedLanguages"><xsl:value-of select="concat($usedLanguages,$currentLanguage)"/></xsl:with-param>
+					<xsl:with-param name="usedLanguages"><xsl:value-of select="concat($usedLanguages,'|',$currentLanguage)"/></xsl:with-param>
 					<xsl:with-param name="controlField008-35-37"><xsl:value-of select="$controlField008-35-37"/></xsl:with-param>
 				</xsl:call-template>				
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:call-template name="rfcLanguages">
-					<xsl:with-param name="langCodes"><xsl:copy-of select="$langCodes"/></xsl:with-param>
+				<xsl:call-template name="rfcLanguages">					
 					<xsl:with-param name="nodeNum"><xsl:value-of select="$nodeNum+1"/></xsl:with-param>						
 					<xsl:with-param name="usedLanguages"><xsl:value-of select="concat($usedLanguages,$currentLanguage)"/></xsl:with-param>
 					<xsl:with-param name="controlField008-35-37"><xsl:value-of select="$controlField008-35-37"/></xsl:with-param>
@@ -2614,6 +2649,6 @@ Added Log Comment
 	</xsl:template>
 </xsl:stylesheet><!-- Stylus Studio meta-information - (c)1998-2003 Copyright Sonic Software Corporation. All rights reserved.
 <metaInformation>
-<scenarios ><scenario default="no" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\TESTSETS\marc\78x.xml" htmlbaseurl="" outputurl="..\..\TESTSETS\marc\78xmods.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="v3Test" userelativepaths="yes" externalpreview="no" url="..\..\TESTSETS\marc\tempsubj.xml" htmlbaseurl="" outputurl="..\modsv3Test.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="Apr 02 Test" userelativepaths="yes" externalpreview="no" url="..\..\TESTSETS\marc\MODStest.Apr.02.03.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="v3Test1" userelativepaths="yes" externalpreview="no" url="..\test_files\marcxml.xml" htmlbaseurl="" outputurl="..\test_files\modsv3Converted.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+<scenarios ><scenario default="no" name="Apr 02 Test" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\..\..\temp\x.xml" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="v3Test1" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\test_files\modsv3Converted.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\..\..\..\ckeith\DESKTOP\test.xml" htmlbaseurl="" outputurl="" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
 </metaInformation>
--->
+-->
\ No newline at end of file
diff --git a/etc/MARC21slim2SRWDC.xsl b/etc/MARC21slim2SRWDC.xsl
index f6e9722..0ba4aef 100644
--- a/etc/MARC21slim2SRWDC.xsl
+++ b/etc/MARC21slim2SRWDC.xsl
@@ -1,208 +1,229 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" 
 	xmlns:marc="http://www.loc.gov/MARC21/slim" 
-	xmlns:srw_dc="info:srw/schema/1/dc-schema" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xmlns="http://purl.org/dc/elements/1.1/" 
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	xmlns:srw_dc="info:srw/schema/1/dc-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
+
 	<xsl:import href="MARC21slimUtils.xsl"/>
-	<xsl:output method="xml" indent="yes"/>
-<!-- modification log 
+	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+	<!-- modification log 
 	NT 01/04:  added collection level element
 	and removed attributes
 
--->	
+-->
 	<xsl:template match="/">
-		 <srw_dc:dc xsi:schemaLocation="http://www.loc.gov/z3950/agency/zing/srw/dc-schema.xsd">
-			<xsl:apply-templates select="marc:record"/>
-		 </srw_dc:dc>					
+		<xsl:if test="marc:collection">
+			<srw_dc:dcCollection xmlns:srw_dc="info:srw/schema/1/dc-schema" xsi:schemaLocation="info:srw/schema/1/dc-schema http://www.loc.gov/z3950/agency/zing/srw/dc-schema.xsd">
+				<xsl:for-each select="marc:collection">
+					<xsl:for-each select="marc:record">
+						<srw_dc:dc>
+							<xsl:apply-templates select="."/>
+						</srw_dc:dc>
+					</xsl:for-each>
+				</xsl:for-each>
+			</srw_dc:dcCollection>
+		</xsl:if>
+		<xsl:if test="marc:record">
+
+			<srw_dc:dc xmlns:srw_dc="info:srw/schema/1/dc-schema" xsi:schemaLocation="info:srw/schema/1/dc-schema http://www.loc.gov/z3950/agency/zing/srw/dc-schema.xsd">
+				<xsl:apply-templates select="marc:record"/>
+			</srw_dc:dc>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="marc:record">
+
 		<xsl:variable name="leader" select="marc:leader"/>
 		<xsl:variable name="leader6" select="substring($leader,7,1)"/>
 		<xsl:variable name="leader7" select="substring($leader,8,1)"/>
 		<xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
 
-			<xsl:for-each select="marc:datafield[@tag=245]">
-				<title>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abfghk</xsl:with-param>
-					</xsl:call-template>
-				</title>
-			</xsl:for-each>
-	
-			<xsl:for-each select="marc:datafield[@tag=100]|marc:datafield[@tag=110]|marc:datafield[@tag=111]|marc:datafield[@tag=700]|marc:datafield[@tag=710]|marc:datafield[@tag=711]|marc:datafield[@tag=720]">
-				<creator>
-					<xsl:value-of select="normalize-space(.)"/>
-				</creator>
-			</xsl:for-each>
-
-			<type>		
-				<xsl:if test="$leader7='c'">
-					<!-- nt fix 1/04 -->
-					<!--<xsl:attribute name="collection">yes</xsl:attribute>-->
-					<xsl:text>collection</xsl:text>
-				</xsl:if>
-
-				<xsl:if test="$leader6='d' or $leader6='f' or $leader6='p' or $leader6='t'">
-					<!-- nt fix 1/04 -->
-					<!--<xsl:attribute name="manuscript">yes</xsl:attribute> -->
-					<xsl:text>manuscript</xsl:text>
-				</xsl:if>
-
-				<xsl:choose>
-					<xsl:when test="$leader6='a' or $leader6='t'">text</xsl:when>
-					<xsl:when test="$leader6='e' or $leader6='f'">cartographic</xsl:when>
-					<xsl:when test="$leader6='c' or $leader6='d'">notated music</xsl:when>
-					<xsl:when test="$leader6='i' or $leader6='j'">sound recording</xsl:when>
-					<xsl:when test="$leader6='k'">still image</xsl:when>
-					<xsl:when test="$leader6='g'">moving image</xsl:when>
-					<xsl:when test="$leader6='r'">three dimensional object</xsl:when>
-					<xsl:when test="$leader6='m'">software, multimedia</xsl:when>
-					<xsl:when test="$leader6='p'">mixed material</xsl:when>
-				</xsl:choose>
+		<xsl:for-each select="marc:datafield[@tag=245]">
+			<title>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abfghk</xsl:with-param>
+				</xsl:call-template>
+			</title>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=100]|marc:datafield[@tag=110]|marc:datafield[@tag=111]|marc:datafield[@tag=700]|marc:datafield[@tag=710]|marc:datafield[@tag=711]|marc:datafield[@tag=720]">
+			<creator>
+				<xsl:value-of select="normalize-space(.)"/>
+			</creator>
+		</xsl:for-each>
+
+		<type>
+			<xsl:if test="$leader7='c'">
+				<!-- nt fix 1/04 -->
+				<!--<xsl:attribute name="collection">yes</xsl:attribute>-->
+				<xsl:text>collection</xsl:text>
+			</xsl:if>
+
+			<xsl:if test="$leader6='d' or $leader6='f' or $leader6='p' or $leader6='t'">
+				<!-- nt fix 1/04 -->
+				<!--<xsl:attribute name="manuscript">yes</xsl:attribute> -->
+				<xsl:text>manuscript</xsl:text>
+			</xsl:if>
+
+			<xsl:choose>
+				<xsl:when test="$leader6='a' or $leader6='t'">text</xsl:when>
+				<xsl:when test="$leader6='e' or $leader6='f'">cartographic</xsl:when>
+				<xsl:when test="$leader6='c' or $leader6='d'">notated music</xsl:when>
+				<xsl:when test="$leader6='i' or $leader6='j'">sound recording</xsl:when>
+				<xsl:when test="$leader6='k'">still image</xsl:when>
+				<xsl:when test="$leader6='g'">moving image</xsl:when>
+				<xsl:when test="$leader6='r'">three dimensional object</xsl:when>
+				<xsl:when test="$leader6='m'">software, multimedia</xsl:when>
+				<xsl:when test="$leader6='p'">mixed material</xsl:when>
+			</xsl:choose>
+		</type>
+
+		<xsl:for-each select="marc:datafield[@tag=655]">
+			<type>
+				<xsl:value-of select="normalize-space(.)"/>
 			</type>
-
-			<xsl:for-each select="marc:datafield[@tag=655]">
-				<type>
-					<xsl:value-of select="normalize-space(.)"/>
-				</type>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=260]">
-				<publisher>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">ab</xsl:with-param>
-					</xsl:call-template>
-				</publisher>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='c']">
-				<date>
-					<xsl:value-of select="."/>
-				</date>				
-			</xsl:for-each>
-
-			<language>
-				<xsl:value-of select="substring($controlField008,36,3)"/>
-			</language>
-
-			<xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q']">
-				<format>
-					<xsl:value-of select="."/>
-				</format>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=520]">
-				<description>
-					<!-- nt fix 01/04 -->
-					<xsl:value-of select="normalize-space(marc:subfield[@code='a'])"/>
-				</description>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=521]">
-				<description>
-					<xsl:value-of select="marc:subfield[@code='a']"/>
-				</description>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[500&lt;@tag][@tag&lt;=599][not(@tag=506 or @tag=530 or @tag=540 or @tag=546)]">
-				<description>
-					<xsl:value-of select="marc:subfield[@code='a']"/>
-				</description>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=600]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=610]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=611]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-		
-			<xsl:for-each select="marc:datafield[@tag=630]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=650]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=653]">
-				<subject>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdq</xsl:with-param>
-					</xsl:call-template>
-				</subject>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=752]">
-				<coverage>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcd</xsl:with-param>
-					</xsl:call-template>
-				</coverage>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=530]">
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=260]">
+			<publisher>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">ab</xsl:with-param>
+				</xsl:call-template>
+			</publisher>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=260]/marc:subfield[@code='c']">
+			<date>
+				<xsl:value-of select="."/>
+			</date>
+		</xsl:for-each>
+
+		<language>
+			<xsl:value-of select="substring($controlField008,36,3)"/>
+		</language>
+
+		<xsl:for-each select="marc:datafield[@tag=856]/marc:subfield[@code='q']">
+			<format>
+				<xsl:value-of select="."/>
+			</format>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=520]">
+			<description>
+				<!-- nt fix 01/04 -->
+				<xsl:value-of select="normalize-space(marc:subfield[@code='a'])"/>
+			</description>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=521]">
+			<description>
+				<xsl:value-of select="marc:subfield[@code='a']"/>
+			</description>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[500&lt;@tag][@tag&lt;=599][not(@tag=506 or @tag=530 or @tag=540 or @tag=546)]">
+			<description>
+				<xsl:value-of select="marc:subfield[@code='a']"/>
+			</description>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=600]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=610]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=611]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=630]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=650]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=653]">
+			<subject>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdq</xsl:with-param>
+				</xsl:call-template>
+			</subject>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=752]">
+			<coverage>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcd</xsl:with-param>
+				</xsl:call-template>
+			</coverage>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=530]">
 			<!-- nt 01/04 attribute fix -->
-				<relation>
-					<!--<xsl:attribute name="type">original</xsl:attribute>-->
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">abcdu</xsl:with-param>
-					</xsl:call-template>
-				</relation>	
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=760]|marc:datafield[@tag=762]|marc:datafield[@tag=765]|marc:datafield[@tag=767]|marc:datafield[@tag=770]|marc:datafield[@tag=772]|marc:datafield[@tag=773]|marc:datafield[@tag=774]|marc:datafield[@tag=775]|marc:datafield[@tag=776]|marc:datafield[@tag=777]|marc:datafield[@tag=780]|marc:datafield[@tag=785]|marc:datafield[@tag=786]|marc:datafield[@tag=787]">
-				<relation>
-					<xsl:call-template name="subfieldSelect">
-						<xsl:with-param name="codes">ot</xsl:with-param>
-					</xsl:call-template>
-				</relation>	
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=856]">
-				<identifier>
-					<xsl:value-of select="marc:subfield[@code='u']"/>
-				</identifier>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=506]">
-				<rights>
-					<xsl:value-of select="marc:subfield[@code='a']"/>
-				</rights>
-			</xsl:for-each>
-
-			<xsl:for-each select="marc:datafield[@tag=540]">
-				<rights>
-					<xsl:value-of select="marc:subfield[@code='a']"/>
-				</rights>
-			</xsl:for-each>		
+			<relation>
+				<!--<xsl:attribute name="type">original</xsl:attribute>-->
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">abcdu</xsl:with-param>
+				</xsl:call-template>
+			</relation>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=760]|marc:datafield[@tag=762]|marc:datafield[@tag=765]|marc:datafield[@tag=767]|marc:datafield[@tag=770]|marc:datafield[@tag=772]|marc:datafield[@tag=773]|marc:datafield[@tag=774]|marc:datafield[@tag=775]|marc:datafield[@tag=776]|marc:datafield[@tag=777]|marc:datafield[@tag=780]|marc:datafield[@tag=785]|marc:datafield[@tag=786]|marc:datafield[@tag=787]">
+			<relation>
+				<xsl:call-template name="subfieldSelect">
+					<xsl:with-param name="codes">ot</xsl:with-param>
+				</xsl:call-template>
+			</relation>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=856]">
+			<identifier>
+				<xsl:value-of select="marc:subfield[@code='u']"/>
+			</identifier>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=020]">
+			<identifier>
+				<xsl:text>URN:ISBN:</xsl:text>
+				<xsl:value-of select="marc:subfield[@code='a']"/>
+			</identifier>
+		</xsl:for-each>
+
+
+		<xsl:for-each select="marc:datafield[@tag=506]">
+			<rights>
+				<xsl:value-of select="marc:subfield[@code='a']"/>
+			</rights>
+		</xsl:for-each>
+
+		<xsl:for-each select="marc:datafield[@tag=540]">
+			<rights>
+				<xsl:value-of select="marc:subfield[@code='a']"/>
+			</rights>
+		</xsl:for-each>
 	</xsl:template>
 </xsl:stylesheet>