Fix RPN to CQL mappings, i.e use string attributes

[pazpar2-moved-to-github.git] / etc / marc21.xsl

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 22710d2..61cb641 100644 (file)
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -10,9 +10,13 @@
 <!-- Extract metadata from MARC21/USMARC 
       http://www.loc.gov/marc/bibliographic/ecbdhome.html
 -->  
-  <xsl:template name="template-hook"/>
+  <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>
@@ -227,6 +231,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 +248,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>