a.binder %!s(int64=6) %!d(string=hai) anos
pai
achega
9003ce5b3c

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

@@ -2097,7 +2097,7 @@
         <!--<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:variable name="type_uri" select="parent::schema/@targetNamespace"/>
         <xsl:choose>
             <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>
@@ -2108,16 +2108,17 @@
                     <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]/(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>system_cache__appinfo:get_prefix_from_element(.) = <xsl:value-of select="parent::schema/@targetNamespace"/></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 $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:message>$type_uri = <xsl:value-of select="$type_uri"/></xsl:message>
+                            <xsl:message>debug found 2101 <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 $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)])"/>; ($prefix="<xsl:value-of select="$prefix"/>")</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=$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=$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>
@@ -2920,7 +2921,7 @@
                     <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 = $type_uri]/(complexType|simpleType)/concat(' jest: ',name(),'/',@name)"/></xsl:message>
+                    <xsl:message>debug found 251 <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 = $type_uri]/(complexType|simpleType)/concat(' jest: ',name(),'/',@name)"/></xsl:message>
                     <xsl:message terminate="yes">251:a ERROR not found or too many elements with name:($type)=<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:when>
                 <xsl:when test="$type_uri='http://www.w3.org/2001/XMLSchema'"><xsl:value-of select="'xs'"/></xsl:when>

+ 2 - 2
SE/schema/patterns/A_STATUS.xsd

@@ -57,8 +57,8 @@
                                              id="A__A_STATUS___d15e2762-1"/>
                                  <xs:element ref="default_db__x3A__BADANIA_W_TERENIE:BADANIA_W_TERENIE_OFF_HARD"
                                              id="A__A_STATUS___d15e2763-1"/>
-                                 <xs:element ref="default_db__x3A__BADANIA_W_TERENIE:BADANIA_W_TERENIE_DELETED"
-                                             id="A__A_STATUS___d15e2764-1"/>
+                                 <!--<xs:element ref="default_db__x3A__BADANIA_W_TERENIE:BADANIA_W_TERENIE_DELETED"
+                                             id="A__A_STATUS___d15e2764-1"/>-->
                               </xs:choice>
                               <xs:choice id="A__A_STATUS___d15e2765-1">
                                  <xs:element ref="default_db__x3A__IN7_DZIENNIK_KORESP:IN7_DZIENNIK_KORESP"