Changeset 9281 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionXhtmlTransf/bs.xml.xsl

Timestamp:

06/20/07 12:55:14 (5 years ago)

Author:

sys

Message:

compositionXhtmlTransf : Ajout dans sm:link/callModel la présevation du contexte de nav : @navCtx="preserveCurrent"

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionXhtmlTransf/bs.xml.xsl (modified) (4 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionXhtmlTransf/bs.xml.xsl

@@ -655 +655 @@
         <xsl0:template match="sm:root" mode="callModel">
                 <xsl0:choose>
-                        <xsl0:when test="count(parent::sm:callModel/parent::sm:link) != 0">
+                        <xsl0:when test="parent::sm:callModel/parent::sm:link">
                                 <!-- On demande la page liée et on retourne l'url de cette page. -->
-                                <source type="xpath-dynamique">resultatDialogue(concat('/@', getIdFromPath(concat('src:', java:hGetUri(srcFileAgent('@@')))), '<xsl0:value-of select="getAxisSuffix(@axis)"/>'), 'act:')</source>
-                        </xsl0:when>
-                        <xsl0:when test="count(/sm:compositionXhtmlTransf/sm:content)!= 0 or count(ancestor::sm:mainZone)!= 0 or count(ancestor::sm:zone) != 0">
+                                <source type="xpath-dynamique">resultatDialogue(concat('<xsl0:value-of select="si(@navCtx='preserveCurrent', '@', '/@')"/>', getIdFromPath(concat('src:', java:hGetUri(srcFileAgent('@@')))), '<xsl0:value-of select="getAxisSuffix(@axis)"/>'), 'act:')</source>
+                        </xsl0:when>
+                        <xsl0:when test="/sm:compositionXhtmlTransf/sm:content or ancestor::sm:mainZone or ancestor::sm:zone">
                                 <!-- On demande le contenu de cet agent. -->
                                 <source type="xpath-dynamique">resultatAgent(concat('@', getIdFromPath(concat('src:', java:hGetUri(srcFileAgent('@@')))), '<xsl0:value-of select="getAxisSuffix(@axis)"/>/xhtmlContent'))</source>
@@ -671 +671 @@
         <xsl0:template match="sm:current" mode="callModel">
                 <xsl0:choose>
-                        <xsl0:when test="count(parent::sm:callModel/parent::sm:link) != 0">
+                        <xsl0:when test="parent::sm:callModel/parent::sm:link">
                                 <!-- On demande la page liée et on retourne l'url de cette page. -->
-                                <source type="xpath-dynamique">resultatDialogue(concat('/@', switchAxis(codeAgent('//'), '<xsl0:value-of select="@axis"/>')), 'act:')</source>
-                        </xsl0:when>
-                        <xsl0:when test="count(/sm:compositionXhtmlTransf/sm:content)!= 0 or count(ancestor::sm:mainZone)!= 0 or count(ancestor::sm:zone) != 0">
+                                <source type="xpath-dynamique">resultatDialogue(concat('<xsl0:value-of select="si(@navCtx='preserveCurrent', '@', '/@')"/>', switchAxis(codeAgent('//'), '<xsl0:value-of select="@axis"/>')), 'act:')</source>
+                        </xsl0:when>
+                        <xsl0:when test="/sm:compositionXhtmlTransf/sm:content or ancestor::sm:mainZone or ancestor::sm:zone">
                                 <!-- On demande le contenu de cet agent. -->
                                 <source type="xpath-dynamique">resultatAgent(concat('@', switchAxis(codeAgent('//'), '<xsl0:value-of select="@axis"/>'), '/xhtmlContent'))</source>
@@ -687 +687 @@
         <xsl0:template match="sm:lookForAscendants" mode="callModel">
                 <xsl0:choose>
-                        <xsl0:when test="count(parent::sm:callModel/parent::sm:link) != 0">
+                        <xsl0:when test="parent::sm:callModel/parent::sm:link">
                                 <!-- On demande la page liée et on retourne l'url de cette page. -->
-                                <source type="xpath-dynamique">resultatDialogue(concat('/@', switchAxis(codeAgent(lookForAncestorAgentByTypes($vDialog<xsl0:apply-templates mode="callModel"/>)[<xsl0:value-of select="si(@direction='rootToCurrent', 'last()', '1')"/>]), '<xsl0:value-of select="@axis"/>')), 'act:')</source>
-                        </xsl0:when>
-                        <xsl0:when test="count(/sm:compositionXhtmlTransf/sm:content)!= 0 or count(ancestor::sm:mainZone)!= 0 or count(ancestor::sm:zone) != 0">
+                                <source type="xpath-dynamique">resultatDialogue(concat('<xsl0:value-of select="si(@navCtx='preserveCurrent', '@', '/@')"/>', switchAxis(codeAgent(lookForAncestorAgentByTypes($vDialog<xsl0:apply-templates mode="callModel"/>)[<xsl0:value-of select="si(@direction='rootToCurrent', 'last()', '1')"/>]), '<xsl0:value-of select="@axis"/>')), 'act:')</source>
+                        </xsl0:when>
+                        <xsl0:when test="/sm:compositionXhtmlTransf/sm:content or ancestor::sm:mainZone or ancestor::sm:zone">
                                 <!-- On demande le contenu de cet agent. -->
                                 <source type="xpath-dynamique">resultatAgent(concat('@', switchAxis(codeAgent(lookForAncestorAgentByTypes($vDialog<xsl0:apply-templates mode="callModel"/>)[<xsl0:value-of select="si(@direction='rootToCurrent', 'last()', '1')"/>]), '<xsl0:value-of select="@axis"/>'), '/xhtmlContent'))</source>
@@ -704 +704 @@
         <xsl0:template match="sm:agentPath" mode="callModel">
                 <xsl0:choose>
-                        <xsl0:when test="count(parent::sm:callModel/parent::sm:link) != 0">
+                        <xsl0:when test="parent::sm:callModel/parent::sm:link">
                                 <!-- On demande la page liée et on retourne l'url de cette page. -->
                                 <source type="xpath-dynamique">resultatDialogue('<xsl0:value-of select="@path"/>', 'act:')</source>
                         </xsl0:when>
-                        <xsl0:when test="count(/sm:compositionXhtmlTransf/sm:content)!= 0 or count(ancestor::sm:mainZone)!= 0 or count(ancestor::sm:zone) != 0">
+                        <xsl0:when test="/sm:compositionXhtmlTransf/sm:content or ancestor::sm:mainZone or ancestor::sm:zone">
                                 <!-- On demande le contenu de cet agent (résolu par rapport au dialog en cours). -->
                                 <source type="xpath-dynamique">resultatAgent(agent('<xsl0:value-of select="@path"/>', $vDialog))</source>