Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 478e7f4..61cb641 100644 (file)
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -231,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']">

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 5b08a8d..f15a602 100644 (file)
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -78,6 +78,9 @@
       <metadata name="subject" termlist="yes" rank="0"/>
       <metadata name="snippet" brief="yes" merge="unique"/>
       <metadata name="electronic-url" brief="yes" merge="no"/>
+      <metadata name="electronic-format-type" />
+      <metadata name="electronic-format-instruction" />
+      <metadata name="electronic-url" brief="yes" merge="no"/>
       <metadata name="electronic-text" brief="yes" merge="no"/>
       <metadata name="electronic-note"/>
       <metadata name="citation"/>