Changeset 8869

Timestamp:

03/05/07 18:17:03 (5 years ago)

Author:

sys

Message:

scormCam : bugs sm:itemBody/sm:callModel

Location:

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_scormCamCompoWebSiteTransf

Files:

• bs.xml.xsl (modified) (4 diffs)
• calledTransformersInc.xsl (modified) (1 diff)

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_scormCamCompoWebSiteTransf/bs.xml.xsl

@@ -154 +154 @@
         
         <!-- ######### comps : création des composants fils de la structure racine. ########-->
-        <xsl0:template match="sm:itemFolder|sm:itemAsset|sm:itemSco" mode="comps">
+        <xsl0:template match="sm:itemFolder|sm:itemAsset|sm:itemSco|sm:children" mode="comps">
                 <xsl0:param name="vRacineComp"/>
                 <xsl0:apply-templates mode="comps">
@@ -180 +180 @@
                                 <xsl0:when test="$vRacineComp">
                                         <xsl0:attribute name="racine"><xsl0:value-of select="$vRacineComp"/></xsl0:attribute>
-                                        <xsl0:apply-templates mode="comps"/>
+                                        <xsl0:apply-templates mode="itemBody"/>
                                 </xsl0:when>
                                 <xsl0:otherwise>
-                                        <xsl0:apply-templates mode="comps"/>
+                                        <xsl0:apply-templates mode="itemBody"/>
                                 </xsl0:otherwise>
                         </xsl0:choose>
                 </valeur>
         </xsl0:template>
-        <xsl0:template match="sm:callSubModel" mode="comps">
+        <xsl0:template match="node()" mode="comps"/>
+        
+        <!-- ######### itemBody : bascule vers la navigation. ########-->
+        <xsl0:template match="sm:callSubModel" mode="itemBody">
                 <source type="xpath-dynamique">resultat(agent('@@/getItemUrl'), dialog(concat('/@', switchAxis(resultatAgent('codeAgentSubM'), '<xsl0:value-of select="@axis"/>'))))</source>
                 <valeur code="codeAgentSubM">
@@ -194 +197 @@
                 </valeur>
         </xsl0:template>
-        <xsl0:template match="sm:callModel" mode="comps">
-                <source type="xpath-dynamique">resultat(agent('@@/getItemUrl'), dialog(<xsl0:apply-templates select="sm:callModel/*" mode="callModel"/>))</source>
-        </xsl0:template>
-        <xsl0:template match="*" mode="comps"/>
+        <xsl0:template match="sm:callModel" mode="itemBody">
+                <source type="xpath-dynamique">resultat(agent('@@/getItemUrl'), dialog(<xsl0:apply-templates mode="callModel"/>))</source>
+        </xsl0:template>
+        <xsl0:template match="node()" mode="itemBody"/>
 
         <!-- ######### content : construction du contenu de la page (dans la xsl-statique + inclusion-dynamique en mode "in" ). ########-->
@@ -265 +268 @@
                 </valeur>
         </xsl0:template>
-        <xsl0:template match="sm:root" mode="callModel">concat('@', getIdFromPath(concat('src:', java:hGetUri(srcFileAgent('@@')))), '<xsl0:value-of select="getAxisSuffix(@axis)"/>/scormCam')</xsl0:template>
-        <xsl0:template match="sm:current" mode="callModel">concat('@', switchAxis(codeAgent('//'), '<xsl0:value-of select="@axis"/>'), '/scormCam')</xsl0:template>
-        <xsl0:template match="sm:lookForAscendants" mode="callModel">concat('@', switchAxis(codeAgent(lookForAncestorAgentByTypes($vDialog<xsl0:apply-templates mode="callModel"/>)[<xsl0:value-of select="si(@direction='rootToCurrent', 'last()', '1')"/>]), '<xsl0:value-of select="@axis"/>'), '/scormCam')</xsl0:template>
+        <xsl0:template match="sm:root" mode="callModel">concat('@', getIdFromPath(concat('src:', java:hGetUri(srcFileAgent('@@')))), '<xsl0:value-of select="getAxisSuffix(@axis)"/><xsl0:if test="not(parent::*/parent::sm:itemBody)">/scormCam</xsl0:if>')</xsl0:template>
+        <xsl0:template match="sm:current" mode="callModel">concat('@', switchAxis(codeAgent('//'), '<xsl0:value-of select="@axis"/>')<xsl0:if test="not(parent::*/parent::sm:itemBody)">, '/scormCam'</xsl0:if>)</xsl0:template>
+        <xsl0:template match="sm:lookForAscendants" mode="callModel">concat('@', switchAxis(codeAgent(lookForAncestorAgentByTypes($vDialog<xsl0:apply-templates mode="callModel"/>)[<xsl0:value-of select="si(@direction='rootToCurrent', 'last()', '1')"/>]), '<xsl0:value-of select="@axis"/>')<xsl0:if test="not(parent::*/parent::sm:itemBody)">, '/scormCam'</xsl0:if>)</xsl0:template>
         <xsl0:template match="sm:callableModel" mode="callModel">,'<xsl0:value-of select="resultatAgent(concat('@', getIdFromPath(@sc:refUri), '/codeModel'))"/>'</xsl0:template>
         <xsl0:template match="sm:agentPath" mode="callModel">agent('<xsl0:value-of select="@path"/>', $vDialog)</xsl0:template>
-        <xsl0:template match="*" mode="callModel"/>
-        <xsl0:template match="text()|@*" mode="callModel"/>     
+        <xsl0:template match="node()" mode="callModel"/>
                 
         <!-- ######### contentTitleIn : gestion des titres inline. ########-->  

trunk/Wsp_ModelingAssmnt/spaces/gen/modelBuilder/bs.doss/sma_scormCamCompoWebSiteTransf/calledTransformersInc.xsl

@@ -94 +94 @@
         <xsl:template match="sm:callModel" mode="in">
                 <xsl:apply-templates mode="in">
-                        <xsl:with-param name="vView" select="si(ancestor::sm:itemBody, 'navigation', 'scormCam')"/>
+                        <xsl:with-param name="vView" select="si(parent::sm:itemBody, 'navigation', 'scormCam')"/>
                 </xsl:apply-templates>
         </xsl:template>