a.binder 6 gadi atpakaļ
vecāks
revīzija
6280faf9a3

+ 6 - 1
SE/schema/default_db_xml_cache.public/get_all_xsd.xsl

@@ -822,6 +822,7 @@
                         @targetNamespace:<xsl:value-of select="schema/@targetNamespace" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>;</xsl:comment>
                     <xsl:variable name="schema_node_144" select="."/>
                     <xsl:for-each select="schema" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"><!--[ @targetNamespace != $targetNamespace ] namespace::node() = $targetNamespace   and @targetNamespace='moj_ogrodek' -->
+                        <xsl:sort select="max( count(*/descendant-or-self::*[ @ref or not(contains(@type,'xs:')) ]))" order="ascending" data-type="number"/>
                         <xsl:message>#239::detect_resource_type przetwarzam schemat:@targetNamespace:<xsl:value-of select="@targetNamespace"/>;</xsl:message>
                         <xsl:variable name="prefix_83" select="namespace::node()[. = $targetNamespace]/name()"/>
                         <xsl:variable name="targetNamespace_134" select="@targetNamespace"/>
@@ -859,6 +860,7 @@
                         </xsl:choose>
                         <xsl:if test="count(.//node()[(local-name()='element' or local-name()='complexType' or local-name()='sequence' or local-name()='choice' or local-name()='complexContent' or local-name()='extension' ) and not(@id)])=0">
                                 <xsl:for-each select="(element|complexType)"  xpath-default-namespace="http://www.w3.org/2001/XMLSchema"><!-- dla ograniczenia mozna [$prefix_134='test_objects']-->
+                                    <xsl:sort select="max( count(descendant-or-self::*[@ref or not(contains(@type,'xs:')) ]))" order="ascending" data-type="number"/>
                                     <xsl:variable name="complexType_or_element_name186">
                                         <xsl:choose>
                                             <xsl:when test="local-name()='element'"><xsl:value-of select="@name"/></xsl:when>
@@ -866,7 +868,10 @@
                                             <xsl:otherwise><xsl:message terminate="yes">#391 it should work only for element or complexType</xsl:message></xsl:otherwise>
                                         </xsl:choose>
                                     </xsl:variable>
-                                    <xsl:comment>157: buduje plaski obiekt/mape przetwarzania w celu przeszukania relacji @id=<xsl:value-of select="@id"/>; targetNamespace:<xsl:value-of select="$prefix_134"/>; $complexType_or_element_name186=<xsl:value-of select="$complexType_or_element_name186"/>; name:<xsl:value-of select="@name"/>; namespace-uri-for-prefix=<xsl:value-of select="namespace-uri-for-prefix($prefix_134,.)"/></xsl:comment>
+                                    <xsl:comment>157: count(descendant-or-self::*)="<xsl:value-of select="count(descendant-or-self::*)"/>" 
+                                        count2(descendant-or-self::*)="<xsl:value-of select="count(descendant-or-self::*[ @ref or not(contains(@type,'xs:')) ])"/>"
+                                        buduje plaski obiekt/mape przetwarzania w celu przeszukania relacji @id=<xsl:value-of select="@id"/>; targetNamespace:<xsl:value-of select="$prefix_134"/>; 
+                                        $complexType_or_element_name186=<xsl:value-of select="$complexType_or_element_name186"/>; name:<xsl:value-of select="@name"/>; namespace-uri-for-prefix=<xsl:value-of select="namespace-uri-for-prefix($prefix_134,.)"/></xsl:comment>
                                     <xsl:message>157: buduje plaski obiekt/mape przetwarzania w celu przeszukania relacji @id=<xsl:value-of select="@id"/>; targetNamespace:<xsl:value-of select="$prefix_134"/>; $complexType_or_element_name186=<xsl:value-of select="$complexType_or_element_name186"/>; name:<xsl:value-of select="@name"/>; namespace-uri-for-prefix=<xsl:value-of select="namespace-uri-for-prefix($prefix_134,.)"/></xsl:message>
                                     <xsl:choose>
                                         <xsl:when test="local-name()='element'">

+ 1 - 1
SE/schema/default_db_xml_cache/build_complexType.xsl

@@ -2177,7 +2177,7 @@
                         <xsl:otherwise><xsl:value-of select="$procesy5_system_schema/system_cache__appinfo:get_all_xsd_list/(system_cache__appinfo:get_all_xsd|system_cache__appinfo:get_all_xsd_external_schema_id_namespace_prefix)/schema[@targetNamespace=$type_uri and simpleType[@name=$name] ]/namespace::node()[.=$type_uri]/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:otherwise>
                     </xsl:choose>
                 </xsl:variable>
-                <xsl:message>#2101B TODO save to ($prefix="<xsl:value-of select="$prefix"/>") <xsl:value-of select="system_cache__appinfo:element-filename.symlink('build_complexType__simpleType',@name,$prefix,$type_uri)"/></xsl:message>
+                <xsl:message>#2101B TODO save to ($prefix="<xsl:value-of select="$prefix"/>") <xsl:value-of select="system_cache__appinfo:element-filename.symlink('build_complexType__simpleType',@name,$prefix,$type_uri)"/>; ($name="<xsl:value-of select="$name"/>")</xsl:message>
             </xsl:otherwise>
         </xsl:choose>
         <xsl:comment>209: simpleType applied! system_cache__appinfo:root_element_in_schema:<xsl:value-of select="$system_cache__appinfo:root_element_in_schema"/>; if-prepare(<xsl:value-of select="$if-prepare"/>)</xsl:comment>