From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 8 Mar 2011 16:56:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.5~11
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=024e09f8e12037aafc92917d546c707be5a764a7;hp=09e752194178c47e62eb2cc45bdf58728a87ea54;p=pazpar2-moved-to-github.git

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

diff --git a/etc/dads-pz2.xsl b/etc/dads-pz2.xsl
index 551d1f6..b8a391e 100644
--- a/etc/dads-pz2.xsl
+++ b/etc/dads-pz2.xsl
@@ -86,7 +86,7 @@
         <pz:metadata type="journal-subpart">
             <xsl:text>Vol. </xsl:text><xsl:value-of select="vol" />
             <xsl:text> no. </xsl:text><xsl:value-of select="issue" />
-            <xsl:text> (</xsl:text><xsl:value-of select="year" /><xsl:text>-</xsl:text><xsl:value-of select="month" /><xsl:text>)</xsl:text>
+            <xsl:text> (<xsl:value-of select="month" /><xsl:text>-</xsl:text></xsl:text><xsl:value-of select="year" /><xsl:text>)</xsl:text>
             <xsl:text> p. </xsl:text><xsl:value-of select="page" />
         </pz:metadata>
     </xsl:for-each>      
diff --git a/test/dads-pz2.xsl b/test/dads-pz2.xsl
index 246e399..b8a391e 100644
--- a/test/dads-pz2.xsl
+++ b/test/dads-pz2.xsl
@@ -56,8 +56,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
-
+    
     <pz:record>
       <xsl:for-each select="author/name">
         <pz:metadata type="author">
@@ -82,6 +81,15 @@
           <xsl:value-of select="." />
         </pz:metadata>
       </xsl:for-each>
+      
+    <xsl:for-each select="journal"> 
+        <pz:metadata type="journal-subpart">
+            <xsl:text>Vol. </xsl:text><xsl:value-of select="vol" />
+            <xsl:text> no. </xsl:text><xsl:value-of select="issue" />
+            <xsl:text> (<xsl:value-of select="month" /><xsl:text>-</xsl:text></xsl:text><xsl:value-of select="year" /><xsl:text>)</xsl:text>
+            <xsl:text> p. </xsl:text><xsl:value-of select="page" />
+        </pz:metadata>
+    </xsl:for-each>      
 
       <xsl:for-each select="localInfo/systemno"> 
         <pz:metadata type="system-control-nr">