a.binder 6 лет назад
Родитель
Сommit
b099dcb19e

Разница между файлами не показана из-за своего большого размера
+ 420 - 165
SE/schema/ant-object/default_db.ADMIN_USERS/ADMIN_USERS/ADMIN_USERS.xsd


+ 17 - 7
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_DZIENNIK_KORESP.dita

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelatedFeature xpath="ID"  typeName="p5_default_db:IN7_DZIENNIK_KORESP" typeNameRealResource="p5_default_db:IN7_DZIENNIK_KORESP"
   xmlns:ogc="http://www.opengis.net/ogc"
+  xmlns:wfs="http://www.opengis.net/wfs"
   doctype-public="-//OASIS//DTD DITA Topic//EN"
   doctype-system="topic.dtd"
   >
@@ -24,7 +25,7 @@
             <p>Nadawca:</p><ph/>
             <p xpath="name1"/><ph/>
             <p xpath="name2"/><ph/>
-            <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph> ul.</ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
+            <p><ph xpath="kod"/><ph> </ph><ph xpath="miasto"/><ph xpath.match.regex="ul." xpath="ulica" xpath.not.match.regex.text="ul."></ph><ph xpath="ulica"/><ph> </ph><ph xpath="numer_dom"/></p>
             <p><ph>nip:</ph><ph xpath="nip"/><ph> regon:</ph><ph xpath="regon"/></p>
             <p><ph>email:</ph><ph xpath="BILLING_OWNER_EMAIL"/> <ph> tel:</ph><ph xpath="tel"/> </p>
             <p><ph>nr r-ku:</ph><ph xpath="nr_rach"/></p>
@@ -84,12 +85,21 @@
           <stentry>Opis</stentry>
           <stentry><ph xpath="M_DIST_DESC"/></stentry>
         </strow>
+        <RelatedFeature wfs:MAXFEATURES="1" xpath="ID_PROJECT" xpath_value="../ID" typeName="p5_default_db:BUILDINGS" typeNameRealResource="p5_default_db:BUILDINGS">
+          <strow>
+            <stentry>Dotyczy budynków</stentry>
+            <stentry><ph xpath="S_ADDRESS_POST_CODE"/> <ph xpath="S_ADDRESS_CITY"/> <ph xpath="S_ADDRESS_STREET_FULL"/> <ph xpath="S_ADDRESS_HOUSE"/> </stentry>
+          </strow>
+        </RelatedFeature>
+        
+        
+        
       </simpletable>
       
     </RelatedFeature>
-    <p>Tresc: </p>
+    <p>Treść: </p>
     <bodydiv xpath="K_ZAWARTOSC_HTML" format="enter_to_ph"/>
-    <p> Miejsca na podpisy<simpletable frame="all" relcolwidth="1.0* 1.0*"
+    <p> <simpletable frame="all" relcolwidth="1.0* 1.0*"
       id="simpletable_ejm_j2r_cz">
       <strow>
         <stentry/> 
@@ -109,10 +119,10 @@
               <ph xpath="ADM_PERSON_SIGN_SVG"  xpath.match.regex="[a-zA-Z0-9]"> <ph xpath="ADM_NAME"/></ph>
               <svg-container xpath="ADM_PERSON_SIGN_SVG" format="system_cache__appinfo:escaped_html_to_xml" /><!-- xpath.match.regex="[a-zA-Z0-9]" -->
               <codeblock xpath="ADM_PERSON_SIGN_SVG" xpath.match.regex="^$">
-                |            
-                |            
-                |            
-                |                       
+               
+               
+               
+               
               </codeblock>
             </RelatedFeature>
           

+ 5 - 1
SE/schema/default_db_xml_cache.public/build_ant_universal_by_xsl_match.xsl

@@ -41,10 +41,14 @@
     <!--<xsl:param name="external_schema_table.path" required="yes"/>-->
     
     
+    
     <xsl:template mode="build_element_complexType.xml build_detect_resource_type.xml build_detect_objects_parent_relations.xml build_SimpleSchema.xml" match="system_cache__appinfo:element_complexType"> <!-- for type generate in main build.xml mode -->
-                <project basedir="{$basedir}" name="{$antfile_prefix}" default="{$antfile_prefix}"
+                <project basedir="{$basedir}" name="{$antfile_prefix}" default="{$antfile_prefix}" 
                     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd">
                     <xsl:if test="$properties.xml"><xsl:copy-of select="doc($properties.xml)/properties/*" copy-namespaces="no"/></xsl:if>
+                    
+                    
+                    
                     <target name="{$antfile_prefix}">
                         <parallel  failonany="true" threadCount="1" > <!-- {$threadCount} threadCount="4"  -->
                             <xsl:variable name="system_cache__appinfo:element_complexType">

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

@@ -19,6 +19,7 @@
     <xsl:import href="system_cache__appinfo/vrtfNamespaces.xsl"/>
     <xsl:import href="p5_tr_map/element-filename.xsl"/>
     <xsl:import href="object_parent_relations/element-filename.xsl"/> <!-- param name="p5opr:detect_objects_parent_relations.local" required="yes"  -->
+    <xsl:import href="system_cache__appinfo/basedir.xsl"/>
     <xsl:include href="p5_simpleSchema_map/element-filename.xsl"/>
     
     <xsl:include href="../ant-object/default_db.ant-object.basedir.xsl"/>
@@ -573,7 +574,7 @@
                                     <xsl:value-of select="ant-object:location__x3A__default_db.validate($default_db.ant-object.basedir,document-uri(/))"/>
                                 </xsl:comment>
                                 <system_cache__appinfo:get_all_xsd debug="@2019-08 problem if should be _default_db"><!-- _default_db -->
-                                    <xsl:attribute name="system_cache__appinfo:document-uri" select="substring-after(document-uri(/), $default_db.ant-object.basedir)"/>
+                                    <xsl:attribute name="system_cache__appinfo:document-uri" select="substring-after(document-uri(/), $basedir)"/><!-- $default_db.ant-object.basedir -->
                                     <xsl:attribute name="system_cache__appinfo:document-uri-full" select="document-uri(/)"/>
                                     <xsl:call-template name="ant-object:location__x3A__default_db.validate">
                                         <xsl:with-param name="document-uri" select="document-uri(/)"/>

+ 10 - 3
SE/schema/default_db_xml_cache/build_complexType.xsl

@@ -62,7 +62,7 @@
         <xsl:param name="prefix"/>
         <xsl:param name="name"/>
         <xsl:choose>
-            <xsl:when test="string-length($path)&gt;3000">
+            <xsl:when test="string-length($path)&gt;4000">
                 <xsl:message terminate="yes">42:complex_path_detect_loop: ERROR LOOP PATH LENGHT EXCEED:(<xsl:value-of select="string-length($path)"/>); $id:<xsl:value-of select="$id"/>; test:<xsl:value-of select="concat('/',$element,':',$prefix,':',$name,'/')"/>; path:<xsl:value-of select="$path"/>;</xsl:message>
                 <xsl:value-of select="'loop'"/></xsl:when><!-- zabezpiecznie LOOP extra TODO -->
             <xsl:when test="$id">
@@ -1323,7 +1323,13 @@
                 </xsl:variable>
                 <xsl:if test="$restriction_base">
                     <xsl:if test="count($restriction_base//@id[../@system_cache__appinfo:restriction_path=$restriction_path and parent::node()/name()!='system_cache__appinfo:restriction_base'])!=1">
-                        <xsl:message terminate="yes">263:ERROR system_cache__appinfo:build_element cannot found/or too many: count:(<xsl:value-of select="count($restriction_base//@id[../@system_cache__appinfo:restriction_path=$restriction_path  and parent::node()/name()!='system_cache__appinfo:restriction_base'])"/>;) restriction @base for @id:<xsl:value-of select="@id"/>; $xpath_local:<xsl:value-of select="$xpath_local"/>; for element. Case complexType restriction has max_occurs=0 and @base complexType has not such element at all. ? TODO is this real requirement $path:<xsl:value-of select="$path"/>;</xsl:message>
+                        <xsl:message terminate="yes">263:ERROR system_cache__appinfo:build_element cannot found/or too many: count:(<xsl:value-of select="count($restriction_base//@id[../@system_cache__appinfo:restriction_path=$restriction_path  and parent::node()/name()!='system_cache__appinfo:restriction_base'])"/>;) restriction @base for @id:<xsl:value-of select="@id"/>; $xpath_local:<xsl:value-of select="$xpath_local"/>; for element. Case complexType restriction has max_occurs=0 and @base complexType has not such element at all. ? TODO is this real requirement $path:<xsl:value-of select="$path"/>;
+                            count($restriction_base//@id)="<xsl:value-of select="count($restriction_base//@id)"/>" ; 
+                            $restriction_path="<xsl:value-of select="$restriction_path"/>";
+                            <xsl:for-each select="$restriction_base//*">
+                                pos(<xsl:value-of select="position()"/>); name="<xsl:value-of select="name()"/>" <xsl:for-each select="@*"> @<xsl:value-of select="name()"/>="<xsl:value-of select="."/>"; </xsl:for-each>
+                            </xsl:for-each>
+                        </xsl:message>
                         <xsl:attribute name="system_cache__appinfo:ERROR263" select="concat('system_cache__appinfo:build_element cannot found/or too many: count:(',count($restriction_base//@id[../@system_cache__appinfo:restriction_path=$restriction_path  and parent::node()/name()!='system_cache__appinfo:restriction_base']),';) restriction @base for @id:',@id,'; $xpath_local:',$xpath_local,'; $restriction_path:',$restriction_path,'; for element ? TODO is this real requirement')"/>
                     </xsl:if>
                     <!-- TODO error - there is possible that there is not @id - BAD SCHEMA - so previoulsy should be checked schema against if it has @id !!!!  -->
@@ -2828,6 +2834,7 @@
         <xsl:param name="xpath_local"/>
         <xsl:param name="recurse" />
         <xsl:variable name="debug_line" select="804"/>
+        <xsl:message>#2834 WARNING UNKNOWN ELEMENT name()=<xsl:value-of select="name()"/>; @name="<xsl:value-of select="@name"/>"; @id="<xsl:value-of select="@id"/>;"</xsl:message>
         <xsl:if test="$debug_level&gt;3"><xsl:message><xsl:value-of select="$debug_line"/>: complexContent applied! No-schema-element  prefix:<xsl:value-of select="$prefix"/>; p.tNS:<xsl:value-of select="$targetNamespace"/>; path:<xsl:value-of select="$path"/>;</xsl:message>
             <xsl:comment><xsl:value-of select="$debug_line"/>: complexContent applied! No-schema-element  prefix:<xsl:value-of select="$prefix"/>; p.tNS:<xsl:value-of select="$targetNamespace"/>; path:<xsl:value-of select="$path"/>;</xsl:comment></xsl:if>
         <xsl:element name="{name()}">
@@ -3189,7 +3196,7 @@
                 
                 <!--<xsl:variable name="element-filename" select="system_cache__appinfo:escape_object_prefix_to_string(concat(system_cache__appinfo:prefix_from_targetNamespace($system_cache__appinfo:vrtfNamespaces,$type_uri),':',$complexType))"/>-->
                 <xsl:choose>
-                    <xsl:when test="(string-length($path) &gt; 100 and $type_uri='http://docs.oasis-open.org/wsbpel/2.0/process/executable' ) or string-length($path) &gt; 3000 ">
+                    <xsl:when test="(string-length($path) &gt; 100 and $type_uri='http://docs.oasis-open.org/wsbpel/2.0/process/executable' ) or string-length($path) &gt; 2000 ">
                         <xsl:message terminate="no">#2863 TODO apply mode xp5r:cache </xsl:message>
                         <xp5r:cache xp5r:id="{generate-id(../.)}" xp5r:basedir="{$basedir}" xp5r:stylesheet="{$basedir}/default_db_xml_cache/build_complexType.xsl">
                             <xp5r:apply-template mode="system_cache__appinfo:build_flat_schema">

Некоторые файлы не были показаны из-за большого количества измененных файлов