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

Conflicts:
	etc/tmarc.xsl

Fix or between d901 and d907 for iii-id

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index 198dbdd..ad945f9 100644 (file)
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -771,7 +771,7 @@
         <xsl:value-of select="$has_fulltext"/>
       </pz:metadata>
 
-      <xsl:for-each select="tmarc:d907 or tmarc:d901">
+      <xsl:for-each select="tmarc:d901 ! tmarc:d907">
         <pz:metadata type="iii-id">
           <xsl:value-of select="tmarc:sa" />
         </pz:metadata>