Changeset 9303

Timestamp:

07/02/07 13:53:47 (5 years ago)

Author:

anp

Message:

#190 correction bug sm:WBox/sm:WFor/sm:callSubModel non pris en compte

File:

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

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionOdtTransf/getContent.xsl.xsl

@@ -257 +257 @@
                 <xsl:variable name="vName"><xsl:value-of select="local-name()"/></xsl:variable>
                 <xsl:variable name="vTitleContent"><xsl0:apply-templates select="sm:title" mode="mContent"/></xsl:variable>
-                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[starts-with(local-name(), 'call')]" mode="mContent"/></xsl:variable>
+                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[name()!='sm:title']" mode="mContent"/></xsl:variable>
                 <xsl:variable name="vIsTitleMandatory"><xsl0:value-of select="boolean(sm:title/sm:fixedTitle)"/></xsl:variable><!-- si il existe un fixedString, le paragraphe de titre est tjs affichée-->
                 <xsl:choose>
@@ -291 +291 @@
                 <xsl:variable name="vIsTitleMandatory"><xsl0:value-of select="boolean(sm:title/sm:fixedTitle)"/></xsl:variable><!-- si il existe un fixedString, le paragraphe de titre est tjs affiché -->
                 <xsl:variable name="vIsTitlePresent"><xsl:value-of select="string-length(normalize-space($vTitleContent))&gt;0 or $vIsTitleMandatory='true'"/></xsl:variable>
-                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[starts-with(local-name(), 'call')]" mode="mContent"/></xsl:variable>
+                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[name()!='sm:title' and name()!='sm:caption']" mode="mContent"/></xsl:variable>
                 <xsl:choose>
                         <xsl:when test="string-length(normalize-space($vTitleContent))&gt;0 or string-length(normalize-space($vDataContent))&gt;0">
@@ -340 +340 @@
                 <xsl:variable name="vTitleContent"><xsl0:apply-templates select="sm:title" mode="mContent"/></xsl:variable>
                 <xsl:variable name="vIsTitleMandatory"><xsl0:value-of select="boolean(sm:title/sm:fixedTitle)"/></xsl:variable><!-- si il existe un fixedString, le paragraphe de titre est tjs affichée-->
-                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[starts-with(local-name(), 'call')]" mode="mContent"/></xsl:variable>
+                <xsl:variable name="vDataContent"><xsl0:apply-templates select="*[name()!='sm:title' and name()!='sm:picture']" mode="mContent"/></xsl:variable>
                 <xsl:choose>
                         <xsl:when test="string-length(normalize-space($vTitleContent))&gt;0 or string-length(normalize-space($vDataContent))&gt;0">