X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fmarc21.xsl;h=b8ae3ee7f8228c26d654943e81eb26265eeb1b08;hb=b1c01879c1b6f3a66df19da30e11f0cbe8f354bb;hp=b8481ad514464aae3548df4df80c4e9638735b85;hpb=cc6af886fdd7480208a5362fe9e13bd0427fbc8d;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index b8481ad..b8ae3ee 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: marc21.xsl,v 1.17 2007-08-16 02:44:19 quinn Exp $ -->
+<!-- $Id: marc21.xsl,v 1.20 2007-08-16 12:40:01 jakub Exp $ -->
 <xsl:stylesheet
     version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -12,6 +12,7 @@
 <!-- Extract metadata from MARC21/USMARC 
       http://www.loc.gov/marc/bibliographic/ecbdhome.html
 -->  
+  <xsl:include href="pz2-ourl-marc21.xsl" />
   
   <xsl:template match="/marc:record">
     <xsl:variable name="title_medium" select="marc:datafield[@tag='245']/marc:subfield[@code='h']"/>
@@ -52,6 +53,7 @@
 	<xsl:value-of select="$medium"/>
       </xsl:attribute>
 
+      
       <xsl:for-each select="marc:controlfield[@tag='001']">
         <pz:metadata type="id">
           <xsl:value-of select="."/>
@@ -200,10 +202,13 @@
       </xsl:for-each>
       
       <xsl:for-each select="marc:datafield[@tag='650' or @tag='653']">
-	<pz:metadata type="subject">
+        <pz:metadata type="subject">
+	  <xsl:value-of select="marc:subfield[@code='a']"/>
+	</pz:metadata>
+	<pz:metadata type="subject-long">
 	  <xsl:for-each select="marc:subfield">
 	    <xsl:if test="position() > 1">
-	      <xsl:text> -- </xsl:text>
+	      <xsl:text>, </xsl:text>
 	    </xsl:if>
 	    <xsl:value-of select="."/>
 	  </xsl:for-each>
@@ -246,7 +251,13 @@
 	  <xsl:value-of select="$fulltext_b"/>
 	</pz:metadata>
       </xsl:if>
+
+        <pz:metadata type="open-url">
+            <xsl:call-template name="insert-md-openurl" />
+        </pz:metadata>
+
     </pz:record>
+
   </xsl:template>
 
 </xsl:stylesheet>