Changeset 9762 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_binaryXhtmlTransf/widgets.xsl.xsl

Timestamp:

09/20/07 23:11:30 (4 years ago)

Author:

sam

Message:

binaryXhtmlTransf : bug sur inclusion widget.

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_binaryXhtmlTransf/widgets.xsl.xsl (modified) (3 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_binaryXhtmlTransf/widgets.xsl.xsl

@@ -70 +70 @@
         <!-- ######### Size templates ########-->       
         <xsl0:template name="sizeAtts">
-                <xsl0:if test="boolean(sm:width/sm:fromPublishedImage) or boolean(sm:height/sm:fromPublishedImage)">
-                        <xsl:variable name="vInfosRes" select="parseXml(resultatAgent('//', concat('get:dest:', resultatAgent('//genResUri_{generate-id(sm:binaryUrl)}'), '?transform=img2props&amp;unit=px')))"/>
-                </xsl0:if>
+                <xsl0:choose>
+                        <xsl0:when test="boolean(*/sm:fromPublishedImage)">
+                                <xsl:variable name="vInfosRes" select="parseXml(resultatAgent('//', concat('get:dest:', resultatAgent('//genResUri_{generate-id(sm:binaryUrl)}'), '?transform=img2props&amp;unit=px')))"/>
+                        </xsl0:when>
+                        <xsl0:when test="boolean(*/sm:fromPublishedObject/@type='flash')">
+                                <xsl:variable name="vInfosRes" select="parseXml(resultatAgent('//', concat('get:dest:', resultatAgent('//genResUri_{generate-id(sm:binaryUrl)}'), '?transform=swf2props')))"/>
+                        </xsl0:when>
+                </xsl0:choose>
                 <xsl0:call-template name="sizeAttWidth"/>
                 <xsl0:call-template name="sizeAttHeight"/>
@@ -88 +93 @@
         <xsl0:template name="sizeWidth">
                 <xsl0:choose>
-                        <xsl0:when test="sm:width/sm:fixedValue"><xsl0:value-of select="sm:width/sm:fixedValue/@value"/></xsl0:when>
-                        <xsl0:when test="sm:width/sm:fromPublishedImage"><xsl:value-of select="$vInfosRes/props/p[@cd='width']"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:width/sm:fixedValue)"><xsl0:value-of select="sm:width/sm:fixedValue/@value"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:width/sm:fromPublishedImage)"><xsl:value-of select="$vInfosRes/props/p[@cd='width']"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:width/sm:fromPublishedObject/@type='flash')"><xsl:value-of select="($vInfosRes/swfHeader/@x2 - $vInfosRes/swfHeader/@x1) div 20"/></xsl0:when>
                 </xsl0:choose>
         </xsl0:template>
         <xsl0:template name="sizeHeight">
                 <xsl0:choose>
-                        <xsl0:when test="sm:height/sm:fixedValue"><xsl0:value-of select="sm:height/sm:fixedValue/@value"/></xsl0:when>
-                        <xsl0:when test="sm:height/sm:fromPublishedImage"><xsl:value-of select="$vInfosRes/props/p[@cd='height']"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:height/sm:fixedValue)"><xsl0:value-of select="sm:height/sm:fixedValue/@value"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:height/sm:fromPublishedImage)"><xsl:value-of select="$vInfosRes/props/p[@cd='height']"/></xsl0:when>
+                        <xsl0:when test="boolean(sm:height/sm:fromPublishedObject/@type='flash')"><xsl:value-of select="($vInfosRes/swfHeader/@y2 - $vInfosRes/swfHeader/@y1) div 20"/></xsl0:when>
                 </xsl0:choose>
         </xsl0:template>
@@ -669 +676 @@
 
         <!-- sm:Widget -->
-        <xsl0:template match="sm:Widget" mode="content"><xsl:value-of select="concat(resultatAgent('widget_{generate-id(.)}'),generate-id())" disable-output-escaping="yes"/></xsl0:template>
+        <xsl0:template match="sm:Widget" mode="content"><xsl:value-of select="resultatAgent(concat('widget_{generate-id(.)}_',generate-id()))" disable-output-escaping="yes"/></xsl0:template>
 
         <xsl0:template match="sm:fixedString" mode="content"><xsl0:value-of select="text()"/></xsl0:template>