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

diff --git a/configure.ac b/configure.ac
index 4023093..9c6d987 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.0.6],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.0.7],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 

diff --git a/debian/changelog b/debian/changelog
index 28f7fc0..b92d0ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.0.7-1) unstable; urgency=low
+
+  * Marc21 stylesheet updated to reflect multiple full text fields
+
+ -- Marc Cromme <marc@indexdata.dk>  Mon, 14 Apr 2008 14:06:53 +0200
+
 pazpar2 (1.0.6-1) unstable; urgency=low
 
   * Wildcars in the target id can be used to apply settings to 

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index cc45fb6..f23ac54 100644 (file)
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -203,7 +203,7 @@
         </pz:metadata>
       </xsl:for-each>
       
-      <xsl:for-each select="marc:datafield[@tag='650' or @tag='653']">
+      <xsl:for-each select="marc:datafield[@tag='650' or @tag='651' or @tag='653']">
         <pz:metadata type="subject">
          <xsl:value-of select="marc:subfield[@code='a']"/>
        </pz:metadata>
@@ -242,17 +242,29 @@
        <xsl:value-of select="$medium"/>
       </pz:metadata>
       
-      <xsl:if test="$fulltext_a">
+      <xsl:for-each select="marc:datafield[@tag='900']/marc:subfield[@code='a']">
+        <pz:metadata type="fulltext">
+          <xsl:value-of select="."/>
+        </pz:metadata>
+      </xsl:for-each>
+
+      <!-- <xsl:if test="$fulltext_a">
        <pz:metadata type="fulltext">
          <xsl:value-of select="$fulltext_a"/>
        </pz:metadata>
-      </xsl:if>
+      </xsl:if> -->
 
-      <xsl:if test="$fulltext_b">
+      <xsl:for-each select="marc:datafield[@tag='900']/marc:subfield[@code='b']">
+        <pz:metadata type="fulltext">
+          <xsl:value-of select="."/>
+        </pz:metadata>
+      </xsl:for-each>
+
+      <!-- <xsl:if test="$fulltext_b">
        <pz:metadata type="fulltext">
          <xsl:value-of select="$fulltext_b"/>
        </pz:metadata>
-      </xsl:if>
+      </xsl:if> -->
 
       <xsl:if test="$open_url_resolver">
         <pz:metadata type="open-url">