Changeset 9486 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/pp.content.xsl.xsl

Timestamp:

08/21/07 17:20:46 (4 years ago)

Author:

anp

Message:

optimisation dataBlock + debug

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/pp.content.xsl.xsl (modified) (5 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/pp.content.xsl.xsl

@@ -36 +36 @@
                 #             <scOd:dataBlock category="xxxx">
                 #                                       <scOd:id value=""/>
-                #                                       <scOd:sortKey></scOd:sortKey>
+                #                                       <scOd:sortKey value=""/>
                 #                                       <scOd:title></scOd:title>
                 #                                       <scOd:data>odContent</scOd:data>
@@ -188 +188 @@
                         <xsl:param name="pIdForEach"/>
                         <xsl:param name="pMode"/><!-- [|ignoreAlreadyShowBlocks] -->
-                        <xsl:for-each select="//scOd:dataBlockDeclaration[@category=$pCateg]">
+                        <xsl:for-each select="key('dataBlockDeclaration', $pCateg)">
                                 <blocks category="{{$pCateg}}">
                                         <documentBlockList firstShowDbId="{{generate-id(//scOd:showDataBlocks[@category=$pCateg][1]//scOd:forEachBlock[1])}}"><!-- liste des dataBlock tels que déclarés -->
@@ -198 +198 @@
                                                                 <xsl:with-param name="pIdForEach" select="$pIdForEach"/>
                                                                 <xsl:with-param name="pMode" select="$pMode"/>
-                                                                <xsl:sort select="normalize-space(scOd:sortKey)" data-type="text" order="{{key('dataBlockDeclaration', @category)/@sort}}"/>
+                                                                <xsl:sort select="normalize-space(scOd:sortKey/@value)" data-type="text" order="{{key('dataBlockDeclaration', @category)/@sort}}"/>
                                                         </xsl:apply-templates>
                                                 </xsl:when>
@@ -252 +252 @@
                                 <xsl:if test="  not(key('dataBlockDeclaration', @category)/@hideEmptyBlocks='yes' 
                                                                 and not($vHasData)) and not(key('dataBlockDeclaration', @category)/@hideSameBlock='yes' and string-length(scOd:id/@value)!=0 and preceding::scOd:dataBlock[@category=$vCategory and scOd:id/@value=$vId] and preceding::scOd:dataBlock[@category=$vCategory and scOd:id/@value=$vId]/scOd:data=$vData)"><!-- si block vide OU déja pris en compte => on ne prend pas le block-->
-                                        <block idList="{{normalize-space($vIdBlockList)}}" category="{{@category}}" sortKey="{{normalize-space(scOd:sortKey)}}" idBlock="{{scOd:id/@value}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}">
+                                        <block idList="{{normalize-space($vIdBlockList)}}" category="{{@category}}" sortKey="{{normalize-space(scOd:sortKey/@value)}}" idBlock="{{scOd:id/@value}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}">
                                                 <title><xsl:copy-of select="scOd:title/* | scOd:title/text()"/></title>
                                                 <data><xsl:copy-of select="$vData"/></data>
@@ -354 +354 @@
                         <xsl:variable name="vRefBlockId">
                                 <xsl:choose>
-                                        <xsl:when test="@position='first'"><xsl:value-of select="$vDataBlockList"/></xsl:when>
+                                        <xsl:when test="@position='first'"><xsl:value-of select="$vFirstCall"/></xsl:when>
                                         <xsl:when test="@position='firstCallData' and $vFirstCallData"><xsl:value-of select="$vFirstCallData"/></xsl:when>
                                         <xsl:when test="@position='firstCallData' and $vFirstShowDbCall"><xsl:value-of select="$vFirstShowDbCall"/></xsl:when>
-                                        <xsl:when test="@position='firstCallData'"><xsl:value-of select="$vDataBlockList"/></xsl:when>
+                                        <xsl:when test="@position='firstCallData'"><xsl:value-of select="$vFirstCall"/></xsl:when>
                                 </xsl:choose>
                         </xsl:variable>