X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fmarc21.xsl;h=8d8953ab3593818fc157c8fd1f7b4f240d244ef4;hb=3c19f87bf19965aa789817738b15f74b5d598742;hp=23f41d37a3fc3d9debd8eb259de54c4825f2dd38;hpb=690ca04e712825cb2cd8242c1f33da2909525c9d;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 23f41d3..8d8953a 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -25,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>
@@ -43,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">
@@ -231,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']">