Changeset 9232 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/pp.content.xsl.xsl
- Timestamp:
- 05/10/07 23:30:30 (3 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_odTemplateText/pp.content.xsl.xsl
r8888 r9232 35 35 # - dataBlock 36 36 # <scOd:dataBlock category="xxxx"> 37 # <scOd:id ></scOd:id>37 # <scOd:id value=""/> 38 38 # <scOd:sortKey></scOd:sortKey> 39 39 # <scOd:title></scOd:title> … … 212 212 213 213 <xsl:template match="scOd:dataBlock" mode="getDataBlockList"> 214 <xsl:variable name="vId" select=" normalize-space(scOd:id)"/>214 <xsl:variable name="vId" select="scOd:id/@value"/> 215 215 <xsl:variable name="vCategory" select="@category"/> 216 216 <xsl:variable name="vIsContentShowInDocument"><!-- Permet de dire si la partie "contenu" de ce block a été affichée qq part dans le document --> … … 221 221 </xsl:choose> 222 222 </xsl:variable> 223 <dataBlock refId="{{generate-id()}}" category="{{@category}}" blockId="{{ normalize-space(scOd:id)}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}"/>223 <dataBlock refId="{{generate-id()}}" category="{{@category}}" blockId="{{scOd:id/@value}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}"/> 224 224 </xsl:template> 225 225 … … 227 227 <xsl:param name="pIdForEach"/> 228 228 <xsl:param name="pMode"/><!-- [|ignoreAlreadyShowBlocks] --> 229 <xsl:variable name="vId" select=" normalize-space(scOd:id)"/>229 <xsl:variable name="vId" select="scOd:id/@value"/> 230 230 <xsl:variable name="vCategory" select="@category"/> 231 231 <xsl:variable name="vIdBlockList"> 232 232 <xsl:choose> 233 233 <xsl:when test="key('dataBlockDeclaration', @category)/@hideSameBlock='yes'"><!-- pas de doublon--> 234 <xsl:for-each select="//scOd:dataBlock[@category=$vCategory and normalize-space(scOd:id)=$vId]"><xsl:value-of select="generate-id()"/>###</xsl:for-each>234 <xsl:for-each select="//scOd:dataBlock[@category=$vCategory and scOd:id/@value=$vId]"><xsl:value-of select="generate-id()"/>###</xsl:for-each> 235 235 </xsl:when> 236 236 <xsl:otherwise><!-- on affiche toutes les entrées --> … … 244 244 <xsl:choose> 245 245 <xsl:when test="key('dataBlockDeclaration', @category)/scOd:content//scOd:block.data or key('dataBlockDeclaration', @category)/scOd:conditionalContent//scOd:block.data">true</xsl:when> 246 <xsl:when test="count(//scOd:dataBlock[ normalize-space(scOd:id)=$vId and @category=$vCategory and scOd:overrideContentDeclaration//scOd:block.data])>0">true</xsl:when>246 <xsl:when test="count(//scOd:dataBlock[scOd:id/@value=$vId and @category=$vCategory and scOd:overrideContentDeclaration//scOd:block.data])>0">true</xsl:when> 247 247 <xsl:otherwise>false</xsl:otherwise> 248 248 </xsl:choose> … … 250 250 <xsl:if test="$pMode!='ignoreAlreadyShowBlocks' or key('dataBlockDeclaration', @category)/@hideBlockIfShowInContent='no' or (key('dataBlockDeclaration', @category)/@hideBlockIfShowInContent='yes' and normalize-space($vIsContentShowInDocument)='false')"> 251 251 <xsl:if test=" not(key('dataBlockDeclaration', @category)/@hideEmptyBlocks='yes' 252 and not($vHasData)) and not(key('dataBlockDeclaration', @category)/@hideSameBlock='yes' and string-length( normalize-space(scOd:id))!=0 and preceding::scOd:dataBlock[@category=$vCategory and normalize-space(scOd:id)=$vId] and preceding::scOd:dataBlock[@category=$vCategory and normalize-space(scOd:id)=$vId]/scOd:data=$vData)"><!-- si block vide OU déja pris en compte => on ne prend pas le block-->253 <block idList="{{normalize-space($vIdBlockList)}}" category="{{@category}}" sortKey="{{normalize-space(scOd:sortKey)}}" idBlock="{{ normalize-space(scOd:id)}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}">252 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--> 253 <block idList="{{normalize-space($vIdBlockList)}}" category="{{@category}}" sortKey="{{normalize-space(scOd:sortKey)}}" idBlock="{{scOd:id/@value}}" isContentShowInDocument="{{normalize-space($vIsContentShowInDocument)}}"> 254 254 <title><xsl:copy-of select="scOd:title/* | scOd:title/text()"/></title> 255 255 <data><xsl:copy-of select="$vData"/></data> … … 265 265 <xsl:template match="scOd:dataBlock"> 266 266 <xsl:variable name="vId" select="generate-id()"/> 267 <xsl:variable name="vBlockId" select=" normalize-space(scOd:id)"/>267 <xsl:variable name="vBlockId" select="scOd:id/@value"/> 268 268 <xsl:variable name="vBlockCategory" select="@category"/> 269 269 <xsl:variable name="vBlockList"> … … 282 282 <xsl:when test="xalan:nodeset($vBlockList)//block[contains(@idList, $vId)]/declaration/scOd:conditionalContent"> 283 283 <xsl:choose> 284 <xsl:when test="count(preceding-sibling::scOd:dataBlock[ normalize-space(scOd:id)=$vBlockId and @category=$vBlockCategory])=0"><!-- première déclaration -->284 <xsl:when test="count(preceding-sibling::scOd:dataBlock[scOd:id/@value=$vBlockId and @category=$vBlockCategory])=0"><!-- première déclaration --> 285 285 <xsl:apply-templates select="xalan:nodeset($vBlockList)//block[contains(@idList, $vId)][1]/declaration/scOd:conditionalContent/scOd:firstCall/* | xalan:nodeset($vBlockList)//block[contains(@idList, $vId)][1]/declaration/scOd:conditionalContent/scOd:firstCall/text()"/> 286 286 </xsl:when>
