X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fmarc4j%2Ftest%2Fresources%2Fmarc21.xsl;h=e7bee0c2c3fc724ed496b8786ecb281a5bcaf2db;hb=b81c346e179d156382dda7a061a7048559a4ee54;hp=1aec6b9440d560c5385ab5d8276147aed81415f6;hpb=f438343964271a9b0560ba60c89f12089d69382a;p=marc4j.git

diff --git a/src/org/marc4j/test/resources/marc21.xsl b/src/org/marc4j/test/resources/marc21.xsl
index 1aec6b9..e7bee0c 100644
--- a/src/org/marc4j/test/resources/marc21.xsl
+++ b/src/org/marc4j/test/resources/marc21.xsl
@@ -178,6 +178,24 @@
 	</pz:metadata>
       </xsl:for-each>
 
+      <xsl:for-each select="marc:datafield[@tag='130']">
+        <pz:metadata type="title-uniform">
+          <xsl:value-of select="marc:subfield[@code='a']" />
+        </pz:metadata>
+        <pz:metadata type="title-uniform-media">
+          <xsl:value-of select="marc:subfield[@code='m']" />
+        </pz:metadata>
+        <pz:metadata type="title-uniform-parts">
+          <xsl:value-of select="marc:subfield[@code='n']" />
+        </pz:metadata>
+        <pz:metadata type="title-uniform-partname">
+          <xsl:value-of select="marc:subfield[@code='p']" />
+        </pz:metadata>
+        <pz:metadata type="title-uniform-key">
+          <xsl:value-of select="marc:subfield[@code='r']" />
+        </pz:metadata>
+      </xsl:for-each>
+
       <xsl:for-each select="marc:datafield[@tag='260']">
         <pz:metadata type="date">
           <xsl:value-of select="translate(marc:subfield[@code='c'], 'cp[].', '')" />
@@ -197,24 +215,6 @@
         </pz:metadata>
       </xsl:if>
 
-      <xsl:for-each select="marc:datafield[@tag='130']">
-        <pz:metadata type="title-uniform">
-          <xsl:value-of select="marc:subfield[@code='a']" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-media">
-          <xsl:value-of select="marc:subfield[@code='m']" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-parts">
-          <xsl:value-of select="marc:subfield[@code='n']" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-partname">
-          <xsl:value-of select="marc:subfield[@code='p']" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-key">
-          <xsl:value-of select="marc:subfield[@code='r']" />
-        </pz:metadata>
-      </xsl:for-each>
-
       <xsl:for-each select="marc:datafield[@tag='245']">
         <pz:metadata type="title">
           <xsl:value-of select="marc:subfield[@code='a']"/>
@@ -288,15 +288,12 @@
 	</pz:metadata>
       </xsl:for-each>
 
-	<xsl:for-each
-		select="marc:datafield[@tag = '500' or @tag = '505' or
+      <xsl:for-each select="marc:datafield[@tag = '500' or @tag = '505' or
       		@tag = '518' or @tag = '520' or @tag = '522']">
-		<pz:metadata type="description">
-          <xsl:for-each select="node()">
-            <xsl:value-of select="text()" />
-          </xsl:for-each>
+	<pz:metadata type="description">
+            <xsl:value-of select="*/text()"/>
         </pz:metadata>
-	</xsl:for-each>
+      </xsl:for-each>
 
 	<xsl:for-each
 		select="marc:datafield[@tag='600' or @tag='610' or @tag='611' or @tag='630' or @tag='648' or @tag='650' or @tag='651' or @tag='653' or @tag='654' or @tag='655' or @tag='656' or @tag='657' or @tag='658' or @tag='662' or @tag='69X']">
@@ -313,7 +310,7 @@
 				</xsl:variable>
 				<xsl:choose>
 					<xsl:when test="substring($value,string-length($value)) = ','">
-						<xsl:value-of select="substring($value,0,string-length($value))" />
+						<xsl:value-of select="substring($value,1,string-length($value)-1)" />
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:value-of select="$value" />
@@ -323,20 +320,12 @@
 		</pz:metadata>
 	</xsl:for-each>
 
-    <xsl:for-each select="marc:datafield[@tag='856']">
-	   <pz:metadata type="electronic-url">
-	       <xsl:value-of select="marc:subfield[@code='u']"/>
-	   </pz:metadata>
-	   <pz:metadata type="electronic-text">
-		<xsl:choose>
-			<xsl:when test="marc:subfield[@code='y']">
-                <xsl:value-of select="marc:subfield[@code='y']/text()" />
-			</xsl:when>
-			<xsl:when test="marc:subfield[@code='3']">
-                <xsl:value-of select="marc:subfield[@code='3']/text()" />
-			</xsl:when>
-			<xsl:otherwise>Get resource</xsl:otherwise>
-		</xsl:choose>
+      <xsl:for-each select="marc:datafield[@tag='856']">
+	<pz:metadata type="electronic-url">
+	  <xsl:value-of select="marc:subfield[@code='u']"/>
+	</pz:metadata>
+	<pz:metadata type="electronic-text">
+	  <xsl:value-of select="marc:subfield[@code='y' or @code='3' or @code='a']"/>
 	</pz:metadata>
 	<pz:metadata type="electronic-note">
 	  <xsl:value-of select="marc:subfield[@code='z']"/>