Changeset 529

Timestamp:

03/02/10 17:03:42 (2 years ago)

Author:

anp

Message:

genod : debug prise en compte des ressources alternatives

Location:

trunk/model/sources

Files:

• binaries/flash/flash_od.transf (modified) (2 diffs)
• binaries/flv/flv_od.transf (modified) (1 diff)
• binaries/mp3/mp3_od.transf (modified) (1 diff)
• office/gen/odt/transf/base/mediaWeb/mediaWeb.transf (modified) (1 diff)
• office/gen/odt/transf/base/seqImg.transf (modified) (1 diff)

trunk/model/sources/binaries/flash/flash_od.transf

@@ -4 +4 @@
         <sm:fullTitleText>
                 <sm:dynamicString>
-                        <sm:freeXslFragment>&lt;!-- TODO3.7 : enrichir fullTitleText pour éviter ce free -->
-&lt;xsl:choose>
- &lt;xsl:when test=&quot;resultatAgent('//metaAgt', 'fullTitleText')&quot;>&lt;xsl:value-of select=&quot;resultatAgent('//metaAgt', 'fullTitleText')&quot;/> (&lt;xsl:value-of select=&quot; java:hGetName(srcFileAgent())&quot;/>)&lt;/xsl:when>
- &lt;xsl:otherwise>&lt;xsl:value-of select=&quot; java:hGetName(srcFileAgent())&quot;/>&lt;/xsl:otherwise>
-&lt;/xsl:choose></sm:freeXslFragment>
+                        <sm:freeXslFragment>&lt;!-- TODO3.7 : enrichir fullTitleText pour éviter ce free --&gt;
+&lt;xsl:choose&gt;
+ &lt;xsl:when test="resultatAgent('//metaAgt', 'fullTitleText')"&gt;&lt;xsl:value-of select="resultatAgent('//metaAgt', 'fullTitleText')"/&gt; (&lt;xsl:value-of select=" java:hGetName(srcFileAgent())"/&gt;)&lt;/xsl:when&gt;
+ &lt;xsl:otherwise&gt;&lt;xsl:value-of select=" java:hGetName(srcFileAgent())"/&gt;&lt;/xsl:otherwise&gt;
+&lt;/xsl:choose&gt;</sm:freeXslFragment>
                 </sm:dynamicString>
         </sm:fullTitleText>
@@ -16 +16 @@
                                 <sm:choose>
                                         <!--# on prend le contenu alternatif si il existe contenu alternatif-->
-                                        <sm:when xpath="of:animM/sp:alt/*">
+                                        <sm:when xpath="srcElemAgent(resultatAgent('//metaAgt'))/sp:alt/*">
                                                 <sm:callBinaryMeta/>
                                         </sm:when>

trunk/model/sources/binaries/flv/flv_od.transf

@@ -16 +16 @@
                                 <sm:choose>
                                         <!--# on prend le contenu alternatif si il existe contenu alternatif-->
-                                        <sm:when xpath="of:animM/sp:alt/*">
+                                        <sm:when xpath="srcElemAgent(resultatAgent('//metaAgt'))/sp:alt/*">
                                                 <sm:callBinaryMeta/>
                                         </sm:when>

trunk/model/sources/binaries/mp3/mp3_od.transf

@@ -16 +16 @@
                                 <sm:choose>
                                         <!--# on prend le contenu alternatif si il existe contenu alternatif-->
-                                        <sm:when xpath="of:animM/sp:alt/*">
+                                        <sm:when xpath="srcElemAgent(resultatAgent('//metaAgt'))/sp:alt/*">
                                                 <sm:callBinaryMeta/>
                                         </sm:when>

trunk/model/sources/office/gen/odt/transf/base/mediaWeb/mediaWeb.transf

@@ -16 +16 @@
                                 <sm:choose>
                                         <!--# on prend le contenu alternatif si il existe contenu alternatif-->
-                                        <sm:when xpath="of:animM/sp:alt/*">
+                                        <sm:when xpath="srcElemAgent(resultatAgent('//metaAgt'))/sp:alt/*">
                                                 <sm:callCompositionMeta/>
                                         </sm:when>

trunk/model/sources/office/gen/odt/transf/base/seqImg.transf

@@ -7 +7 @@
                                 <sm:choose>
                                         <!--# on prend le contenu alternatif si il existe-->
-                                        <sm:when xpath="of:animM/sp:alt/*">
+                                        <sm:when xpath="srcElemAgent(resultatAgent('//metaAgt'))/sp:alt/*">
                                                 <sm:callCompositionMeta/>
                                         </sm:when>