Changeset 8881

Timestamp:

03/06/07 09:34:06 (5 years ago)

Author:

anp

Message:

debug dataBlock

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/postProcessing.xsl.xsl (modified) (3 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/postProcessing.xsl.xsl

@@ -363 +363 @@
                 
                 <xsl:template match="scOd:block.data">
-                        <xsl:choose>
-                                <xsl:when test="ancestor::block"><!-- on est dans le contexte d'un showDataBlock -->
-                                        <xsl:variable name="vBlock" select="ancestor::block"/>
+                        <xsl:variable name="vBlock" select="ancestor::*[name()='block' or name()='scOd:dataBlock'][1]"/>
+                        <xsl:choose>
+                                <xsl:when test="local-name($vBlock)='block'"><!-- on est dans le contexte d'un showDataBlock -->
                                         <xsl:variable name="vShowDbId" select="ancestor::root/@showDataBlockId"/>
                                         <text:p text:style-name="odHiddenParagraph"><text:bookmark-start text:name="{{concat($vShowDbId, $vBlock/@idBlock)}}"/><scOd:notIfText/></text:p>
@@ -372 +372 @@
                                 </xsl:when>
                                 <xsl:otherwise>
-                                        <xsl:variable name="vBlock" select="ancestor::scOd:dataBlock"/>
                                         <xsl:apply-templates select="$vBlock/scOd:data/* | $vBlock/scOd:data/text()"/>
                                 </xsl:otherwise>
@@ -379 +378 @@
                 
                 <xsl:template match="scOd:block.label">
-                        <xsl:choose>
-                                <xsl:when test="ancestor::block">
-                                        <xsl:variable name="vBlock" select="ancestor::block"/>
+                        <xsl:variable name="vBlock" select="ancestor::*[name()='block' or name()='scOd:dataBlock'][1]"/>
+                        <xsl:choose>
+                                <xsl:when test="local-name($vBlock)='block'">
                                         <xsl:value-of select="$vBlock/title"/>
                                 </xsl:when>
                                 <xsl:otherwise>
-                                        <xsl:variable name="vBlock" select="ancestor::scOd:dataBlock"/>
                                         <xsl:value-of select="$vBlock/scOd:title"/>
                                 </xsl:otherwise>