Changeset 9330

Timestamp:

07/10/07 11:38:05 (5 years ago)

Author:

sys

Message:

genericWebSiteTransf : sm:lookForExistingModelPage dans sm:navigation

File:

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

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

@@ -163 +163 @@
                 </noeud>
         </xsl0:template>
+        <xsl0:template match="sm:lookForExistingModelPage" mode="listenoeuds">
+                <noeud cle="p_{generate-id()}" type="singleton"><ref type="resultat-dynamique">agent=//lookForPage_<xsl0:value-of select="generate-id()"/></ref></noeud>
+        </xsl0:template>
         <!-- sm:navigation/sm:callModel... -->
         <xsl0:template match="sm:callModel" mode="listenoeuds">
@@ -193 +196 @@
                         <xsl0:apply-templates mode="listenoeuds_choose"/>
                 </xsl:choose>
+        </xsl0:template>
+        <xsl0:template match="sm:lookForExistingModelPage" mode="listenoeuds_choose">
+                <item>[![agent=lookForPage_<xsl0:value-of select="generate-id()"/>]!]</item>
         </xsl0:template>
         <xsl0:template match="*" mode="listenoeuds_choose"/>
@@ -369 +375 @@
         <xsl0:template match="sm:lookForExistingModelPage" mode="callModel">
                 <valeur code="lookForPage_{generate-id()}">
-                        <source type="xpath-dynamique">resultatDialogue(<xsl0:apply-templates mode="callModel" select="sm:navContext/*"/>, concat('lookFor:computeResultWithArguments=act:&amp;codeAgentPrinc=', codeAgent(<xsl0:apply-templates mode="callModel" select="sm:target/*"/>)))</source>
+                        <xsl0:choose>
+                                <xsl0:when test="ancestor::sm:page or not(ancestor::sm:navigation)">
+                                        <source type="xpath-dynamique">resultatDialogue(<xsl0:apply-templates mode="callModel" select="sm:navContext/*"/>, concat('lookFor:computeResultWithArguments=act:&amp;codeAgentPrinc=', codeAgent(<xsl0:apply-templates mode="callModel" select="sm:target/*"/>)))</source>
+                                </xsl0:when>
+                                <xsl0:otherwise>
+                                        <source type="xpath-dynamique">resultatDialogue(<xsl0:apply-templates mode="callModel" select="sm:navContext/*"/>, concat('lookFor:codeAgentPrinc=', codeAgent(<xsl0:apply-templates mode="callModel" select="sm:target/*"/>)))</source>
+                                </xsl0:otherwise>
+                        </xsl0:choose>
                 </valeur>
         </xsl0:template>
@@ -379 +392 @@
         <xsl0:template match="sm:currentNav" mode="callModel">'.'</xsl0:template>
         <xsl0:template match="sm:fromNewRoot" mode="callModel"><xsl0:apply-templates mode="callModel"/></xsl0:template>
-        <xsl0:template match="*" mode="callModel"/>
-        <xsl0:template match="text()|@*" mode="callModel"/>
+        <xsl0:template match="node()|@*" mode="callModel"/>
         
         <!-- Mode pathPage : contruction des path des pages -->