a.binder 6 years ago
parent
commit
13fe3010dd

+ 1 - 1
SE/schema/Types/web_ui.xsd

@@ -329,7 +329,7 @@ href # title Odsiez dane</xs:documentation>
                                                                           name="placeholder"
                                                                           id="che__web_ui___d15e108554-1_placeholde"/>
                                                             <xs:attribute fixed="filter" name="class" id="che__web_ui___d15e108555-1_class"/>
-                                                            <xs:attribute name="type" type="text" id="che__web_ui___d15e108556-1_type"/>
+                                                            <xs:attribute name="type"  id="che__web_ui___d15e108556-1_type"/><!-- type="system_cache__web_ui:text" -->
                                                             <xs:attribute fixed="8" name="size" id="che__web_ui___d15e108557-1_size"/>
                                                          </xs:complexType>
                                                       </xs:element>

+ 8 - 7
SE/schema/default_db_xml_cache/build_complexType.xsl

@@ -2097,29 +2097,30 @@
         <!--<xsl:message>209: simpleType applied! system_cache__appinfo:root_element_in_schema:<xsl:value-of select="$system_cache__appinfo:root_element_in_schema"/>;</xsl:message>-->
         <xsl:variable name="if-prepare" select="unparsed-text-available(system_cache__appinfo:element-filename.prepare('build_complexType__simpleType',@name,$prefix,$targetNamespace))"/>
         <xsl:variable name="name" select="@name"/>
+        <xsl:variable name="type_uri" select="namespace-uri-for-prefix( system_cache__appinfo:get_prefix_from_element(.),.)"/>
         <xsl:choose>
-            <xsl:when test="not($if-prepare) and unparsed-text-available(system_cache__appinfo:element-filename.complete('build_complexType__simpleType',@name,$prefix,$targetNamespace)) "><!-- and $cache='read' --> <!-- concat($default_db.instance.xml,'/build_complexType/complexType-',$element-filename,'.xml') -->
-                <xsl:message>#2101 TODO hit from cache for <xsl:value-of select="system_cache__appinfo:element-filename.complete('build_complexType__simpleType',@name,$prefix,$targetNamespace)"/> </xsl:message>
+            <xsl:when test="not($if-prepare) and unparsed-text-available(system_cache__appinfo:element-filename.complete('build_complexType__simpleType',@name,$prefix,$type_uri)) "><!-- and $cache='read' --> <!-- concat($default_db.instance.xml,'/build_complexType/complexType-',$element-filename,'.xml') -->
+                <xsl:message>#2101 TODO hit from cache for <xsl:value-of select="system_cache__appinfo:element-filename.complete('build_complexType__simpleType',@name,$prefix,$type_uri)"/> </xsl:message>
                 <!--<xsl:copy-of select="doc(system_cache__appinfo:element-filename('build_complexType',$complexType,$prefix,$namespace_uri_param))"/>-->
             </xsl:when>
             <xsl:otherwise>
                 <xsl:variable name="prefix">
                     <xsl:choose>
-                        <xsl:when test="count($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 = $targetNamespace]/(complexType|simpleType)[@name = $name]) != 1" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+                        <xsl:when test="count($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]/(complexType|simpleType)[@name = $name]) != 1" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
                             <!--<xsl:message terminate="no">251:a ERROR not found or too many elements with name:<xsl:value-of select="$type"/>; par.tNS:<xsl:value-of select="$targetNamespace"/>; on type_uri:<xsl:value-of select="$type_uri"/>; count:<xsl:value-of select="count($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]/(complexType|simpleType)[@name = system_cache__appinfo:clean_object_prefix($type)])"/></xsl:message>-->
                             <xsl:message>system_cache__appinfo:get_prefix_from_element(.) = <xsl:value-of select="system_cache__appinfo:get_prefix_from_element(.)"/></xsl:message>
                             <xsl:message>parent::node()/name = <xsl:value-of select="parent::node()/name()"/></xsl:message>
                             <xsl:message>parent::node()/@name = <xsl:value-of select="parent::node()/@name"/></xsl:message>
                             <xsl:message>parent::node()/@id = <xsl:value-of select="parent::node()/@id"/></xsl:message>
                             <xsl:message>debug found <xsl:copy-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 = $targetNamespace]/(complexType|simpleType)/concat(' jest: ',name(),'/',@name)"/></xsl:message>
-                            <xsl:message terminate="no">2101:a ERROR not found or too many elements with name:($name)=<xsl:value-of select="$name"/>; par.tNS:<xsl:value-of select="$targetNamespace"/>; on $targetNamespace:<xsl:value-of select="$targetNamespace"/>; count:<xsl:value-of select="count($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 = $targetNamespace]/(complexType|simpleType)[@name = system_cache__appinfo:clean_object_prefix($name)])"/></xsl:message>
+                            <xsl:message terminate="no">2101:a ERROR not found or too many elements with name:($name)=<xsl:value-of select="$name"/>; par.tNS:<xsl:value-of select="$targetNamespace"/>; on $type_uri:<xsl:value-of select="$type_uri"/>; count:<xsl:value-of select="count($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]/(complexType|simpleType)[@name = system_cache__appinfo:clean_object_prefix($name)])"/></xsl:message>
                         </xsl:when>
                         <xsl:when test="$targetNamespace='http://www.w3.org/2001/XMLSchema'"><xsl:value-of select="'xs'"/></xsl:when>
                         <!-- @2017-11-2 blad na CRM_PROCESS ERROR fixing ! <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]/namespace::node()[.=$type_uri]/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:otherwise>-->
-                        <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=$targetNamespace]/namespace::node()[.=$targetNamespace]/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:otherwise>
+                        <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]/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,$targetNamespace)"/></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)"/></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>
@@ -3444,7 +3445,7 @@
         <xsl:variable name="prefix">
             <xsl:choose>
                 <xsl:when test="count($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]/simpleType[@name = system_cache__appinfo:clean_object_prefix($type)])!=1" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
-                    <xsl:message terminate="yes">1701: ERROR not found or too many elements with name:<xsl:value-of select="$type"/>; par.tNS:<xsl:value-of select="$targetNamespace"/>; on type_uri:<xsl:value-of select="$type_uri"/>; count:<xsl:value-of select="count($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]/attribute[@name = system_cache__appinfo:clean_object_prefix($type)])"/></xsl:message>
+                    <xsl:message terminate="yes">1701: ERROR not found or too many elements with name:<xsl:value-of select="$type"/>; par.tNS:<xsl:value-of select="$targetNamespace"/>; on type_uri:"<xsl:value-of select="$type_uri"/>"; count:<xsl:value-of select="count($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]/attribute[@name = system_cache__appinfo:clean_object_prefix($type)])"/>; (@id="<xsl:value-of select="../@id"/>")</xsl:message>
                 </xsl:when>
                 <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]/namespace::node()[.=$type_uri]/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:otherwise>
             </xsl:choose>