From 60ae856a4b4e2606189e801a6fce926b4dae93c5 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 23 Sep 2016 08:43:34 +0000
Subject: [PATCH] Bugfix for Foundry: The if-collected-volume and
 if-proceedings tags put the collected volume/proceedings item into the
 context, therefore it was not possible to use data from an article or paper
 in the these. The put the collected volume/procedings into the context use
 the collected-volume or the proceedings tag.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4314 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/scipublications.xsl         | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index a665fa283..4b7c0ec5f 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -661,16 +661,24 @@
                             select="foundry:generate-contentitem-link($contentitem-tree/journal/@oid)"/>
         </xsl:apply-templates>
     </xsl:template>
-    
-    <xsl:template match="content-item-layout//scipublications//if-collected-volume">
-        <xsl:param name="contentitem-tree" tunnel="yes"/>
-        
+   
+    <xsl:template match="content-item-layout//scipublications//collected-volume">
+        <xsl:param name="$contentitem-tree" tunnel="yes" />
+
         <xsl:if test="$contentitem-tree/collectedVolume">
             <xsl:apply-templates>
                 <xsl:with-param name="contentitem-tree" 
                                 tunnel="yes" 
                                 select="$contentitem-tree/collectedVolume"/>
-            </xsl:apply-templates>
+            </xsl:apply-templates>            
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="content-item-layout//scipublications//if-collected-volume">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/collectedVolume">
+            <xsl:apply-templates />
         </xsl:if>
     </xsl:template>
     
@@ -743,8 +751,8 @@
             <xsl:apply-templates/>
         </xsl:if>
     </xsl:template>
-    
-    <xsl:template match="content-item-layout//scipublications//if-proceedings">
+
+    <xsl:template match="content-item-layout//scipublications//proceedings">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
         <xsl:if test="$contentitem-tree/proceedings">
@@ -756,6 +764,14 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template match="content-item-layout//scipublications//if-proceedings">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/proceedings">
+            <xsl:apply-templates />
+       </xsl:if>
+    </xsl:template>
+
     <xsl:template match="content-item-layout//scipublications//articles">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
 
@@ -884,4 +900,4 @@
         <xsl:value-of select="$export-formatname"/>
     </xsl:template>
             
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>