Changeset 9331

Timestamp:

10.07.2007 12:03:57 (17 months ago)

Author:

sys

Message:

genericWebSiteTransf : permis pour les primitives de type meta + sm:lookForExistingModelPage dans sm:navigation

Location:

trunk/Wsp_Modeling

Files:

• es/content/transf/genericWebSiteTransf/xml.xed.xml (modified) (1 diff)
• spaces/gen/modelBuilder/bs.doss/sm_genericWebSiteTransf/bs.xml.xsl (modified) (2 diffs)
• spaces/ss/transf/genericWebSiteTransf.ss.xml (modified) (1 diff)

trunk/Wsp_Modeling/es/content/transf/genericWebSiteTransf/xml.xed.xml

@@ -461 +461 @@
                                 <xul:element se:name="sm:model" se:bind="element" >
                                         <xul:atts>
-                                                <xul:ptritem se:bind="plugin" se:attributes="sc:refUri" class="xmlview" notnull="true"  regexpSgn=".*@sm_compositionPrim\b.*"/>
+                                                <xul:ptritem se:bind="plugin" se:attributes="sc:refUri" class="xmlview" notnull="true"  regexpSgn=".*#Class\b.*"/>
                                         </xul:atts>
                                 </xul:element>

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

@@ -62 +62 @@
         <!-- ################# Mode par défaut ################## -->
         <xsl0:template match="sm:genericWebSiteTransf">
-                <structure code="{resultatAgent($vAgentModel/codeModel)}{getAxisSuffix(sm:axis/@code)}" racine="//{resultatAgent($vAgentModel/qNameTagRootModel)}" codecomposant="{si(sm:axis/@code, concat(&quot;concat(getIdNode(..), '&quot;, getAxisSuffix(sm:axis/@code), &quot;')&quot;), 'getIdNode(..)')}" version="1.0">
+                <structure code="{resultatAgent($vAgentModel/codeModel)}{getAxisSuffix(sm:axis/@code)}" 
+                                   racine="//{resultatAgent($vAgentModel/qNameTagRootModel)}" 
+                                   codecomposant="{si(resultatAgent($vAgentModel/isMeta)='true', concat(&quot;concat(getIdNode(..), '_meta&quot;, getAxisSuffix(sm:axis/@code), &quot;')&quot;), si(sm:axis/@code, concat(&quot;concat(getIdNode(..), '&quot;, getAxisSuffix(sm:axis/@code), &quot;')&quot;), 'getIdNode(..)'))}" version="1.0">
                         <xsl0:attribute name="xmlns:{resultatAgent($vAgentModel/prefixModel)}"><xsl0:value-of select="resultatAgent($vAgentModel/nsModel)"/></xsl0:attribute>
                         <xsl0:attribute name="xmlns:java">http://xml.apache.org/xslt/java</xsl0:attribute>
@@ -147 +149 @@
                 <noeud cle="l_{generate-id()}" type="liste">
                         <xsl0:choose>
-                                <xsl0:when test="count(.//sm:callModel) != 0">
+                                <xsl0:when test=".//sm:callModel or .//sm:lookForExistingModelPage">
                                         <!-- les callModel nécessitent une construction dynamique. -->
                                         <listeref type="inclusion-dynamique">

trunk/Wsp_Modeling/spaces/ss/transf/genericWebSiteTransf.ss.xml

@@ -41 +41 @@
         <bdp classSignature="@sm_genericWebSiteTransf#TransfWs:Xhtml:Url:Text#TrsfOf:*">
                 <validAttrParent espace="~param/sc3/base/ss" code="basexml.ss.xml"/>
-                <validAttrMatchSgn nm="model" regexpSgn=".*@sm_compositionPrim\b.*">
+                <validAttrMatchSgn nm="model" regexpSgn=".*#Class\b.*">
                         <pb typ="Error" msg="The referred model is not a composition"/>
                 </validAttrMatchSgn>