Changeset 9847

Timestamp:

10/19/07 10:55:14 (4 years ago)

Author:

sam

Message:

Correction bugs ds binaryXhtmlTransf :

• si sm:link/sm:position/sm:centerScreen[@width or @height]
• bs produite non valide (xml - xmlns vide) si pas de metas

Location:

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss

Files:

• _common/sm/web/sm_WLink.xml.xsl (modified) (1 diff)
• sm_binaryXhtmlTransf/bs.xml.xsl (modified) (1 diff)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/web/sm_WLink.xml.xsl

@@ -209 +209 @@
                                 <xsl0:value-of select="si(sm:position/sm:free/@left, concat('left=', sm:position/sm:free/@left, ','), '')"/>
                                 <xsl0:if test="boolean(sm:position/sm:centerScreen)">
-                                        <xsl0:variable name="vWidth" select="si(boolean(sm:position/sm:centerScreen/@width), sm:position/sm:centerScreen/@width, $pWidthDefault)"/>
-                                        <xsl0:variable name="vHeight" select="si(boolean(sm:position/sm:centerScreen/@height), sm:position/sm:centerScreen/@height, $pHeightDefault)"/>
-                                        <xsl:variable name="vWidth"><xsl0:copy-of select="$vWidth"/></xsl:variable>
-                                        <xsl:variable name="vHeight"><xsl0:copy-of select="$vHeight"/></xsl:variable>
+                                        <xsl:variable name="vWidth">
+                                                <xsl0:choose>
+                                                        <xsl0:when test="sm:position/sm:centerScreen/@width"><xsl0:value-of select="sm:position/sm:centerScreen/@width"/></xsl0:when>
+                                                        <xsl0:otherwise><xsl0:copy-of select="$pWidthDefault"/></xsl0:otherwise>
+                                                </xsl0:choose>
+                                        </xsl:variable>
+                                        <xsl:variable name="vHeight">
+                                                <xsl0:choose>
+                                                        <xsl0:when test="sm:position/sm:centerScreen/@height"><xsl0:value-of select="sm:position/sm:centerScreen/@height"/></xsl0:when>
+                                                        <xsl0:otherwise><xsl0:copy-of select="$pHeightDefault"/></xsl0:otherwise>
+                                                </xsl0:choose>
+                                        </xsl:variable>
                                         <xsl:value-of select="concat('width=', si($vWidth,$vWidth,'800'), ',height=', si($vHeight,$vHeight,'600'), ',left=&quot;', '+(screen.availWidth-', si($vWidth,$vWidth,'800'), ')/2+&quot;,top=&quot;', '+(screen.availHeight-', si($vHeight,$vHeight,'600'), ')/2+&quot;,')"/>
                                 </xsl0:if>

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

@@ -87 +87 @@
                         <source type="xslOnSrc-dynamique">
                                 <xsl:stylesheet version="1.0" exclude-result-prefixes="sc sp sfm {resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/prefixModel)}">
-                                        <xsl0:attribute name="xmlns:{resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/prefixModel)}"><xsl0:value-of select="resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/nsModel)"/></xsl0:attribute>
+                                        <xsl0:if test="boolean(resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/prefixModel))"><xsl0:attribute name="xmlns:{resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/prefixModel)}"><xsl0:value-of select="resultatAgent(computeNodeAgent($vAgentModel/agentMeta)/nsModel)"/></xsl0:attribute></xsl0:if>
                                         <xsl0:attribute name="xmlns:xsl">http://www.w3.org/1999/XSL/Transform</xsl0:attribute>
                                         <xsl0:attribute name="xmlns:sc">http://www.utc.fr/ics/scenari/v3/core</xsl0:attribute>