X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fmarc21.xsl;h=8d8953ab3593818fc157c8fd1f7b4f240d244ef4;hb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;hp=d1699dc65f1bab45967908a55b9c86841a1b3438;hpb=73ec03b9e1e97601dcf1f564d77eb344b6afb4cb;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index d1699dc..8d8953a 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -12,7 +12,11 @@
 -->  
   <xsl:template name="record-hook"/>
 
-  <xsl:template match="/marc:record">
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="marc:record">
     <xsl:variable name="title_medium" select="marc:datafield[@tag='245']/marc:subfield[@code='h']"/>
     <xsl:variable name="journal_title" select="marc:datafield[@tag='773']/marc:subfield[@code='t']"/>
     <xsl:variable name="electronic_location_url" select="marc:datafield[@tag='856']/marc:subfield[@code='u']"/>
@@ -21,7 +25,7 @@
     <xsl:variable name="medium">
       <xsl:choose>
 	<xsl:when test="$title_medium">
-	  <xsl:value-of select="substring-after(substring-before($title_medium,']'),'[')"/>
+	  <xsl:value-of select="translate($title_medium, ' []/', '')"/>
 	</xsl:when>
 	<xsl:when test="$fulltext_a">
 	  <xsl:text>electronic resource</xsl:text>
@@ -39,15 +43,6 @@
     </xsl:variable>
 
     <pz:record>
-      <xsl:attribute name="mergekey">
-        <xsl:text>title </xsl:text>
-	<xsl:value-of select="marc:datafield[@tag='245']/marc:subfield[@code='a']"/>
-	<xsl:text> author </xsl:text>
-	<xsl:value-of select="marc:datafield[@tag='100']/marc:subfield[@code='a']"/>
-	<xsl:text> medium </xsl:text>
-	<xsl:value-of select="$medium"/>
-      </xsl:attribute>
-
       
       <xsl:for-each select="marc:controlfield[@tag='001']">
         <pz:metadata type="id">
@@ -227,6 +222,12 @@
 	<pz:metadata type="electronic-note">
 	  <xsl:value-of select="marc:subfield[@code='z']"/>
 	</pz:metadata>
+	<pz:metadata type="electronic-format-instruction">
+	  <xsl:value-of select="marc:subfield[@code='i']"/>
+	</pz:metadata>
+	<pz:metadata type="electronic-format-type">
+	  <xsl:value-of select="marc:subfield[@code='q']"/>
+	</pz:metadata>
       </xsl:for-each>
 
       <xsl:for-each select="marc:datafield[@tag='773']">
@@ -238,6 +239,19 @@
 	</pz:metadata>
       </xsl:for-each>
 
+      <xsl:for-each select="marc:datafield[@tag='852']">
+        <xsl:if test="marc:subfield[@code='y']">
+	  <pz:metadata type="publicnote">
+	    <xsl:value-of select="marc:subfield[@code='y']"/>
+	  </pz:metadata>
+	</xsl:if>
+	<xsl:if test="marc:subfield[@code='h']">
+	  <pz:metadata type="callnumber">
+	    <xsl:value-of select="marc:subfield[@code='h']"/>
+	  </pz:metadata>
+	</xsl:if>
+      </xsl:for-each>
+
       <pz:metadata type="medium">
 	<xsl:value-of select="$medium"/>
       </pz:metadata>