some fixings for energa not ready yet -

SE/schema/Types/types.xsd

@@ -9,7 +9,7 @@
            xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
            xmlns:p5opr="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/object_parent_relations/object_parent_relations.xsd"
            xmlns:p5_simpleSchema_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/p5_simpleSchema_map.xsd"
-           elementFormDefault="qualified"
+           elementFormDefault="qualified" system_cache__appinfo:document-uri="Types/types.xsd"
            targetNamespace="http://biuro.biall-net.pl/p5/schema/types"><!--<xs:import namespace="http://biuro.biall-net.pl/p5/schema/typeParams" schemaLocation=""/>
 	@2018-03-23 bindera: widze, ze tego nie ma i raczej jest niepotrzebne?
 	-->

SE/schema/WPS_Functions/get_wfs_recurse_xsl/get_wfs_recurse_xsl.xsl

@@ -24,8 +24,8 @@
     <xsl:import href="../../default_db_xml_cache.public/system_cache__appinfo/escape_functions.xsl"/>
     <xsl:import href="../../default_db_xml_cache.public/escaped_html_to_xml.xsl"/>
     
-    <xsl:include href="../../default_db_xml_cache.public/default_db/enter_to_ph.xsl"/>
-    
+    <!--<xsl:include href="../../default_db_xml_cache.public/default_db/enter_to_ph.xsl"/>-->
+    <xsl:include href="../../default_db_xml_cache.public/dita_enter_to_ph.xsl"/>
    
     <xsl:param name="out_task.dita.final" required="yes"/>
     <xsl:output indent="yes"  />

SE/schema/ant-object/default_db.DEALS_TABLE/DEALS_TABLE/DEALS_TABLE.xsd

@@ -8,19 +8,24 @@
    xmlns:SystemObjects__x3A__AccessGroup="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessGroup.xsd"
    xmlns:SystemObjects__x3A__AccessOwner="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
    xmlns:default_db__x3A__DEALS_TABLE="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
-   xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
-   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-   xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
-   xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
    xmlns:fix_se_defaultdb_schema="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/fix_se_defaultdb_schema/fix_se_defaultdb_schema.xsd"
    xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
    xmlns:default_db__x3A__USERS2_OFFERS_GROUPS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS_GROUPS.xsd"
    xmlns:default_db__x3A__USERS2_OFFERS="https://biuro.biall-net.pl/wfs/default_db/table/USERS2_OFFERS.xsd"
    xmlns:default_db__x3A__MK_Rewiry="https://biuro.biall-net.pl/wfs/default_db/table/MK_Rewiry.xsd"
    xmlns:default_db__x3A__COMPANIES="https://biuro.biall-net.pl/wfs/default_db/table/COMPANIES.xsd"
+   xmlns:default_db__x3A__SERVICES="https://biuro.biall-net.pl/wfs/default_db/table/SERVICES.xsd"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
+   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+   xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
+   xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+   xmlns:p5opr="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/object_parent_relations/object_parent_relations.xsd"
+   xmlns:p5_simpleSchema_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/p5_simpleSchema_map.xsd"
+   xmlns:ant-object="http://biuro.biall-net.pl/xmlschema_procesy5/ant-object/ant-object.xsd"
+   xmlns:p5ant-interface="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/ant_interface/ant_interface.xsd"
    targetNamespace="https://biuro.biall-net.pl/wfs/default_db/table/DEALS_TABLE.xsd"
-   vc:minVersion="1.1"
-   xmlns:default_db__x3A__SERVICES="https://biuro.biall-net.pl/wfs/default_db/table/SERVICES.xsd">
+   vc:minVersion="1.1" xmlns:p5="https://biuro.biall-net.pl/wfs">
    <xs:import namespace="http://biuro.biall-net.pl/p5/schema/types"
       schemaLocation="../../../types.xsd"/>
    <xs:import namespace="http://www.opengis.net/gml/3.2"
@@ -43,10 +48,12 @@
       schemaLocation="../../default_db.COMPANIES/COMPANIES/COMPANIES.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/table/SERVICES.xsd"
       schemaLocation="../../default_db.SERVICES/SERVICES/SERVICES.xsd">
+      <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
       <xs:annotation>
          <xs:documentation>Services potrzebne do raportu sprzedazy</xs:documentation>
       </xs:annotation>
    </xs:import>
+   <xs:import namespace="https://biuro.biall-net.pl/wfs" schemaLocation="../../../Types/p5.xsd"/>
    <xs:simpleType name="A_STATUS_Type" id="DEALS_TABLE___d4e6183-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
@@ -59,6 +66,7 @@
       </xs:restriction>
    </xs:simpleType>
    <xs:complexType name="DEALS_TABLE" id="DEALS_TABLE___d4e6192-1_DEALS_TABL">
+      <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
       <xs:annotation>
          <xs:appinfo>
             <system_cache__appinfo:heritage>
@@ -75,14 +83,15 @@
       <xs:sequence id="DEALS_TABLE___d4e6193-1">
          <xs:element name="ID" type="xs:integer" id="DEALS_TABLE___d4e6203-1_ID"/>
          <xs:element name="P_ID" type="xs:integer" id="DEALS_TABLE___d4e6204-1_P_ID"/>
-         <xs:element name="the_geom" type="gml:AbstractFeatureType"
-            id="DEALS_TABLE___d4e6194-1_the_geom"/>
+         <xs:element name="the_geom" type="p5Type:point" id="DEALS_TABLE___d4e6194-1_the_geom"/>
          <xs:element name="A_STATUS" type="default_db__x3A__DEALS_TABLE:A_STATUS_Type"
             id="DEALS_TABLE___d4e6195-1_A_STATUS"/>
          <xs:element name="A_STATUS_INFO" type="xs:string" id="DEALS_TABLE___d4e6196-1_A_STATUS_I"/>
          <xs:element name="L_APPOITMENT_USER" type="xs:string"
             id="DEALS_TABLE___d4e6197-1_L_APPOITME"/>
-         <xs:element ref="default_db__x3A__ADMIN_USERS:L_APPOITMENT_USER">
+         <xs:element ref="default_db__x3A__ADMIN_USERS:L_APPOITMENT_USER"
+            id="DEALS_TABLE___d18e203-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -95,7 +104,8 @@
          <xs:element name="A_ADM_COMPANY" type="xs:string" id="DEALS_TABLE___d4e6201-1_A_ADM_COMP"/>
          <xs:element name="ID_BILLING_USERS" type="xs:integer"
             id="DEALS_TABLE___d4e6206-1_ID_BILLING"/>
-         <xs:element ref="default_db__x3A__COMPANIES:ID_BILLING_USERS">
+         <xs:element ref="default_db__x3A__COMPANIES:ID_BILLING_USERS" id="DEALS_TABLE___d18e211-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
@@ -151,10 +161,12 @@
          <xs:element name="P_ACCOUNT" type="xs:string" id="DEALS_TABLE___d4e6236-1_P_ACCOUNT"/>
          <xs:element name="ID_OFFERS_GROUP" type="xs:integer"
             id="DEALS_TABLE___d4e6237-1_ID_OFFERS_"/>
-         <xs:element ref="default_db__x3A__USERS2_OFFERS_GROUPS:USERS2_OFFERS_GROUPS">
+         <xs:element ref="default_db__x3A__USERS2_OFFERS_GROUPS:USERS2_OFFERS_GROUPS"
+            id="DEALS_TABLE___d18e250-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache> 
+                  <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_OFFERS_GROUP" system_cache__appinfo:xpath="default_db__x3A__USERS2_OFFERS_GROUPS:USERS2_OFFERS_GROUPS/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
@@ -162,10 +174,11 @@
             </xs:annotation>
          </xs:element>
          <xs:element name="ID_OFFERS_ON" type="xs:string" id="DEALS_TABLE___d4e6238-1_ID_OFFERS_"/>
-         <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_ON">
+         <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_ON" id="DEALS_TABLE___d18e258-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache> 
+                  <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_OFFERS_ON" system_cache__appinfo:xpath="default_db__x3A__USERS2_OFFERS:ID_OFFERS_ON/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
@@ -173,10 +186,11 @@
             </xs:annotation>
          </xs:element>
          <xs:element name="ID_OFFERS_OFF" type="xs:string" id="DEALS_TABLE___d4e6239-1_ID_OFFERS_"/>
-         <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_OFF">
+         <xs:element ref="default_db__x3A__USERS2_OFFERS:ID_OFFERS_OFF" id="DEALS_TABLE___d18e267-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache> 
+                  <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_OFFERS_OFF" system_cache__appinfo:xpath="default_db__x3A__USERS2_OFFERS:ID_OFFERS_OFF/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
@@ -196,10 +210,11 @@
          <xs:element name="ROZLICZ_MONTH" type="xs:token" id="DEALS_TABLE___d4e6247-1_ROZLICZ_MO"/>
          <xs:element name="ROZLICZ_ZYSK" type="xs:double" id="DEALS_TABLE___d4e6248-1_ROZLICZ_ZY"/>
          <xs:element name="M_REWIR" type="xs:string" id="DEALS_TABLE___d4e6249-1_M_REWIR"/>
-         <xs:element ref="default_db__x3A__MK_Rewiry:MK_Rewiry">
+         <xs:element ref="default_db__x3A__MK_Rewiry:MK_Rewiry" id="DEALS_TABLE___d18e283-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true"> 
+                  <system_cache__appinfo:flat_relation_cache system_cache__appinfo:backref_evaluate="true">
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="M_REWIR" system_cache__appinfo:xpath="default_db__x3A__MK_Rewiry:MK_Rewiry/NAZWA_REWI"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
@@ -212,29 +227,36 @@
          <xs:element name="OFFERS_ZYSK_INFO" type="xs:string"
             id="DEALS_TABLE___d4e6252-1_OFFERS_ZYS"/>
          <xs:element name="ID_PROJECT" type="xs:integer" id="DEALS_TABLE___d4e6254-1_ID_PROJECT"/>
-         <xs:element name="USTALONA_DATA_PODLACZENIA" type="xs:date"/>
-         <xs:element name="DATA_WYK_PODLACZENIA" type="xs:date"/>
-         <xs:element ref="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT">
+         <xs:element name="USTALONA_DATA_PODLACZENIA" type="xs:date"
+            id="DEALS_TABLE___d18e295-1_USTALONA_D"/>
+         <xs:element name="DATA_WYK_PODLACZENIA" type="xs:date"
+            id="DEALS_TABLE___d18e296-1_DATA_WYK_P"/>
+         <xs:element ref="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT"
+            id="DEALS_TABLE___d18e297-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                  <system_cache__appinfo:flat_relation_cache> 
+                  <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID_PROJECT" system_cache__appinfo:xpath="default_db__x3A__IN7_MK_BAZA_DYSTRYBUCJI:ID_PROJECT/ID"/>
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
                <xs:documentation>@2018-03 todo mamy podwojne dojscie - przez rewir i przez projekt - lepiej od rewiru analizowac sprzedaz</xs:documentation>
             </xs:annotation>
          </xs:element>
-         <xs:element minOccurs="0" ref="default_db__x3A__SERVICES:SERVICES">
+         <xs:element minOccurs="0" ref="default_db__x3A__SERVICES:SERVICES"
+            id="DEALS_TABLE___d18e304-1">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
-                     <system_cache__appinfo:flat_relation_cache> 
-                        <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID" system_cache__appinfo:xpath="default_db__x3A__SERVICES:SERVICES/ID_DEALS_TABLE"/>
-                     </system_cache__appinfo:flat_relation_cache>
-                  </xs:appinfo>
+                  <system_cache__appinfo:flat_relation_cache>
+                     <system_cache__appinfo:source system_cache__appinfo:ref_engine="view" system_cache__appinfo:name="ID" system_cache__appinfo:xpath="default_db__x3A__SERVICES:SERVICES/ID_DEALS_TABLE"/>
+                  </system_cache__appinfo:flat_relation_cache>
+               </xs:appinfo>
                <xs:documentation>Jedna usluga moze miec max jedna umowe raczej. Ta relacja jest potrzebna do raportu sprzedazy. Uwaga podwojne dojscie przez ID_PROJECT jest rowniez! Do tuningu</xs:documentation>
             </xs:annotation>
          </xs:element>
-         <xs:element name="AKTYWACJA_link" type="p5:link">
+         <xs:element name="AKTYWACJA_link" type="p5:link" id="DEALS_TABLE___d18e311-1_AKTYWACJA_">
+            <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
             <xs:annotation>
                <xs:appinfo>
                   <p5Type:simpleLink href="index.php?MENU_INIT=POKAZ_OFERTY_AKTUALNE_FUNC&amp;task=activate_deal&amp;id_deal={ID}" target="_blank" label="Aktywuj umowę {ID}"/>
@@ -245,6 +267,7 @@
    </xs:complexType>
    <xs:element name="DEALS_TABLE" type="default_db__x3A__DEALS_TABLE:DEALS_TABLE"
       id="DEALS_TABLE___d4e6255-1_DEALS_TABL">
+      <!--#375 match annotation with (prefix:xs);(root/schema/@xmlns=())-->
       <xs:annotation>
          <xs:documentation>Umowy z klientami indywidualnymi</xs:documentation>
       </xs:annotation>

SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -20,8 +20,8 @@
     <xsl:param name="with_RelatedFeatureLoop" select="false()"/>
     <xsl:param name="simpleSchema_dir" required="yes"/>
 
-
-    <xsl:include href="default_db/enter_to_ph.xsl"/>
+    <xsl:include href="dita_enter_to_ph.xsl"/>
+    <!--<xsl:include href="default_db/enter_to_ph.xsl"/>-->
     <xsl:include href="escaped_html_to_xml.xsl"/>
 
     <!-- template do zlaczenia wszystkich xmli z danymi z dita 

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.xsl

@@ -562,7 +562,7 @@
                         <!--</xref>-->
                     </xsl:when>
                     <xsl:otherwise>
-                        <ph>
+                        <ph props="debug.565">
                             <xsl:copy-of select="$link__x3A__title"></xsl:copy-of>
                         </ph>
                     </xsl:otherwise>
@@ -678,7 +678,8 @@
         <xsl:choose>
             <xsl:when test="BI_audit_ENERGA_PRACOWNICY_adresy/*">
                 <xsl:for-each select="BI_audit_ENERGA_PRACOWNICY_adresy">
-                    <p>
+                    <xsl:element name="{$system_cache__dita:paragraph_allowed_element__x3A__calculated}">
+                    
                       <!--<sup>-->
                         <xsl:choose>
                             <xsl:when test="last() &gt; 0"><i> adres nr <xsl:value-of select="position()"/>/<xsl:value-of select="last()"/></i></xsl:when>
@@ -690,7 +691,8 @@
                         <xsl:if test="nrBudynku/text()"> dom <b><xsl:value-of select="nrBudynku"/></b></xsl:if>
                         <xsl:if test="nrLokalu/text()"> lok. <b><xsl:value-of select="nrLokalu"/></b></xsl:if>
                         <!--</sup>-->
-                    </p>
+                    
+                    </xsl:element>
                 </xsl:for-each>
             </xsl:when>
         </xsl:choose>

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_4UA.xsl

@@ -123,7 +123,7 @@
                     
                     <topic id="{$uuid}topic_analiza_umow_4ua_{$group_name}_{$position}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                         xsi:noNamespaceSchemaLocation="urn:oasis:names:tc:dita:xsd:topic.xsd">
-                        
+                        <xsl:comment>#2299-126 system_cache__dita:ANALIZA_UMOW_4UA.title</xsl:comment>
                         <xsl:call-template name="system_cache__dita:ANALIZA_UMOW_4UA.title" >
                             <xsl:with-param name="title" select="$title"/>
                         </xsl:call-template>
@@ -233,7 +233,7 @@
                                 <!--<xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="current()"/>--> 
                             </p>
                             
-                            <draft-comment author="a.binder">#807-X $group_name = <xsl:value-of select="$group_name"/>;  count(curr_gr)=<xsl:value-of select="count(current-group())"/> ; </draft-comment>
+                            <draft-comment author="a.binder">#807-X-236 $group_name = <xsl:value-of select="$group_name"/>;  count(curr_gr)=<xsl:value-of select="count(current-group())"/> ; </draft-comment>
                             
                             <foreign>
                                 <!--<xsl:copy-of select="$default_db__x3A__BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA:context.path.childs.attrs.nodeset"/>-->
@@ -1220,7 +1220,7 @@
             <xsl:choose>
                 <xsl:when test="BI_audit_ENERGA_PRACOWNICY_adresy/*">
                     <xsl:for-each select="BI_audit_ENERGA_PRACOWNICY_adresy">
-                        <p>
+                        <ph>
                             <!--<sup>-->
                             <xsl:choose>
                                 <xsl:when test="last() &gt; 0"><i> adres nr <xsl:value-of select="position()"/>/<xsl:value-of select="last()"/></i></xsl:when>
@@ -1232,7 +1232,7 @@
                             <xsl:if test="nrBudynku/text()"> dom: <b><xsl:value-of select="nrBudynku"/></b> </xsl:if>
                             <xsl:if test="nrLokalu/text()"> lok.: <b><xsl:value-of select="nrLokalu"/></b> </xsl:if>
                             <!--</sup>-->
-                        </p>
+                        </ph>
                     </xsl:for-each>
                 </xsl:when>
             </xsl:choose>

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_BI_audit_ENERGA_RUM_KONTRAHENCI.xsl

@@ -293,7 +293,7 @@
                     </prolog>
                     
                     <body>
-                        <draft-comment author="a.binder">#807-X $group_name = <xsl:value-of select="$group_name"/>;  count(curr_gr)=<xsl:value-of select="count(current-group())"/> ; </draft-comment>
+                        <draft-comment author="a.binder">#807-X-296 $group_name = <xsl:value-of select="$group_name"/>;  count(curr_gr)=<xsl:value-of select="count(current-group())"/> ; </draft-comment>
                         <simpletable frame="all" relcolwidth="1* 3* 3*" id="{$uuid}simpletable_rows__child_person_{$group_name}_{$refpos}" props="RUMK_298">
                             <strow>
                                 <stentry>Lp</stentry>

SE/schema/default_db_xml_cache.public/default_db/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_LISTA.xsl

@@ -132,7 +132,7 @@
                             <xsl:for-each-group select="current-group()" group-by="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[last()]/*[1]/@fid"><!-- local-name --><!-- last() -->
                                 <xsl:if test="position()=1">
                                     
-                                    <ph>
+                                    <ph props="debug.136">
                                         <ph><tt><xsl:element name="{$system_cache__dita:subscript}">APT-L</xsl:element></tt></ph>
                                         <ph><xsl:element name="{$system_cache__dita:subscript}">lista tras</xsl:element></ph>
                                         <ph><tt><xsl:element name="{$system_cache__dita:subscript}">od</xsl:element></tt></ph>
@@ -143,7 +143,7 @@
                                               </xref>
                                         </ph>
                                         
-                                        <ph>
+                                        <ph props="debug.146">
                                             <xsl:apply-templates mode="system_cache__dita:BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.universal.body" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ 1]/*[1]">
                                                 <xsl:with-param name="system_cache__dita:subscript" select="$system_cache__dita:subscript"/>
                                                 <xsl:with-param name="end_fid" select="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object[ position()=last()]/*[1]/@fid"/>
@@ -156,7 +156,7 @@
                                     
                                     
                                 </xsl:if>
-                                <ph>
+                                <ph props="debug.159">
                                     <ph>
                                         <tt><xsl:element name="{$system_cache__dita:subscript}">do</xsl:element></tt> 
                                     </ph>

SE/schema/default_db_xml_cache.public/default_db/dateTime.xsl

@@ -29,6 +29,18 @@
                 <!--<xsl:message>#20 date passed as tokenize</xsl:message>-->
                 <xsl:value-of select="tokenize($date,'\.')[3]"/>
             </xsl:when>
+            <xsl:when test="tokenize(string($date),'/')[3]">
+                <xsl:choose>
+                    <xsl:when test="string-length(substring-before(tokenize(string($date),'/')[3],' '))=4">
+                        <xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>
+                        <xsl:message>#28-33A WARNING (system_cache__dita:year) date from="<xsl:value-of select="$date"/>" == "<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>"</xsl:message>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message terminate="no">#28-33 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! =="<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>" </xsl:message>
+                    </xsl:otherwise>
+                </xsl:choose>
+                
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>
@@ -71,6 +83,18 @@
                 <xsl:value-of select="tokenize($date,'\.')[3]"/><xsl:text>-</xsl:text>
                 <xsl:value-of select="tokenize($date,'\.')[2]"/>
             </xsl:when>
+            <xsl:when test="tokenize(string($date),'/')[3]">
+                <xsl:choose>
+                    <xsl:when test="string-length(substring-before(tokenize(string($date),'/')[3],' '))=4">
+                        <xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/><xsl:text>-</xsl:text><xsl:value-of select="tokenize(string($date),'/')[2]"/>
+                        <xsl:message>#28-91A WARNING (system_cache__dita:year-month) date from="<xsl:value-of select="$date"/>" == "<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>-<xsl:value-of select="tokenize(string($date),'/')[2]"/>"</xsl:message>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message terminate="no">#28-91 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! =="<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>" </xsl:message>
+                    </xsl:otherwise>
+                </xsl:choose>
+                
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28-B ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>
@@ -88,17 +112,31 @@
             
             <xsl:when test="string($date) castable as xs:dateTime">
                 <!--<xsl:message>#20 passed as dateTime</xsl:message>-->
-                <xsl:value-of select="format-date(xs:date(xs:dateTime($date)),'[Y]')"/>|<xsl:value-of select="round(number(format-date(xs:date(xs:dateTime($date)),'[m]')) div 3)"/>
+                <xsl:value-of select="format-date(xs:date(xs:dateTime($date)),'[Y]')"/>|<xsl:value-of select="ceiling(number(format-date(xs:date(xs:dateTime($date)),'[m]')) div 3)"/>
             </xsl:when>
             <xsl:when test="string($date) castable as xs:date">
                 <!--<xsl:message>#20 passed as date</xsl:message>-->
-                <xsl:value-of select="format-date(xs:date($date),'[Y]')"/>|<xsl:value-of select="round(number(format-date(xs:date($date),'[m]')) div 3)"/>
+                <xsl:value-of select="format-date(xs:date($date),'[Y]')"/>|<xsl:value-of select="ceiling(number(format-date(xs:date($date),'[m]')) div 3)"/>
             </xsl:when>
             <xsl:when test="tokenize(string($date),'\.')[3]">
                 <!--<xsl:message>#20 date passed as tokenize</xsl:message>-->
                 <xsl:value-of select="tokenize($date,'\.')[3]"/><xsl:text>|</xsl:text>
-                <xsl:value-of select="round(number(tokenize($date,'\.')[2]) div 3)"/>
+                <xsl:value-of select="ceiling(number(tokenize($date,'\.')[2]) div 3)"/>
             </xsl:when>
+            
+            <xsl:when test="tokenize(string($date),'/')[3]">
+                <xsl:choose>
+                    <xsl:when test="string-length(substring-before(tokenize(string($date),'/')[3],' '))=4">
+                        <xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/><xsl:text>|</xsl:text><xsl:value-of select="ceiling(number(tokenize(string($date),'/')[2]) div 3)"/>
+                        <xsl:message>#28-131A WARNING (system_cache__dita:year-quarter) date from="<xsl:value-of select="$date"/>" == "<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>-<xsl:value-of select="ceiling(number(tokenize(string($date),'/')[2]) div 3)"/>"</xsl:message>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message terminate="no">#28-131 ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! =="<xsl:value-of select="substring-before(tokenize(string($date),'/')[3],' ')"/>" </xsl:message>
+                    </xsl:otherwise>
+                </xsl:choose>
+                
+            </xsl:when>
+            
             <xsl:otherwise>
                 <xsl:value-of select="'NaN'"/>
                 <xsl:message terminate="no">#28-C ERROR ERROR in date format for value "<xsl:value-of select="$date"/>"! </xsl:message>

SE/schema/default_db_xml_cache.public/default_db/enter_to_ph.xsl

@@ -13,9 +13,9 @@
     exclude-result-prefixes="xs"
     version="2.0">
     
+    <!-- @2019-09-12 moved/merged all to schema/default_db_xml_cache.public/dita_enter_to_ph.xsl -->
     
-    
-    
+    <!--
     <xsl:template match="*" mode="enter_to_ph">
         <xsl:param name="count"/>
         <xsl:param name="element"/>
@@ -29,17 +29,17 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test=" contains(  text(),'&#13;')">
-                <!--<xsl:message>#32 contains <xsl:value-of select="text()"/> 13; and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
+                <!-\-<xsl:message>#32 contains <xsl:value-of select="text()"/> 13; and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-\->
                 <xsl:for-each select="tokenize(  text(),'&#13;')">
-                    <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
+                    <xsl:element name="{$surround_with}"><!-\- to jest przetwarzane jak jest tekst lamany -\->
                         <xsl:value-of select="."/>
                     </xsl:element>
                 </xsl:for-each>
             </xsl:when>
             <xsl:when test=" contains(  text(),'&#xD;')">
-                <!--<xsl:message>#39 contains <xsl:value-of select="text()"/> xD;  and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
+                <!-\-<xsl:message>#39 contains <xsl:value-of select="text()"/> xD;  and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-\->
                 <xsl:for-each select="tokenize(  text(),'&#xD;')">
-                    <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
+                    <xsl:element name="{$surround_with}"><!-\- to jest przetwarzane jak jest tekst lamany -\->
                         <xsl:value-of select="."/>
                     </xsl:element>
                 </xsl:for-each>
@@ -47,11 +47,11 @@
             <xsl:otherwise>
                 <xsl:choose>
                     <xsl:when test="$count &gt;1">
-                        <!--<xsl:message>#50 codeblock with <xsl:value-of select="text()"/></xsl:message>-->
+                        <!-\-<xsl:message>#50 codeblock with <xsl:value-of select="text()"/></xsl:message>-\->
                         <codeblock>
-                            <!--<xsl:attribute name="DDxpath" select="@xpath"/>-->
-                            <!--DN(<xsl:value-of select="$element"/>)-->
-                            <!--count:<xsl:value-of select="$count"/>-->
+                            <!-\-<xsl:attribute name="DDxpath" select="@xpath"/>-\->
+                            <!-\-DN(<xsl:value-of select="$element"/>)-\->
+                            <!-\-count:<xsl:value-of select="$count"/>-\->
                             <xsl:copy-of select=" text()"/>
                         </codeblock>
                     </xsl:when>
@@ -60,13 +60,13 @@
                         <xsl:apply-templates mode="enter_to_ph_text">
                             <xsl:with-param name="element" select="$element"/>
                         </xsl:apply-templates>
-                        <!--<xsl:copy-of select=" text()"/>-->
+                        <!-\-<xsl:copy-of select=" text()"/>-\->
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-    <!-- dodanie enterow dla tabel w ktorych wyrazy sa dluzsze niz 10 znakow  -->
+    <!-\- dodanie enterow dla tabel w ktorych wyrazy sa dluzsze niz 10 znakow  -\->
     <xsl:template match="text()" mode="enter_to_ph_text">
         <xsl:param name="element" required="yes"/>
         <xsl:choose>
@@ -84,7 +84,7 @@
         </xsl:choose>
     </xsl:template>
     
-    
+    -->
     
     
     <!--<xsl:template name="test">

SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.element.xsl

@@ -16,6 +16,7 @@
             <xsl:when test="$system_cache__dita:element='p'"><xsl:value-of select="'lq'"/></xsl:when>
             <xsl:when test="$system_cache__dita:element='equation-inline'"><xsl:value-of select="'equation-inline'"/></xsl:when>
             <xsl:when test="$system_cache__dita:element='dl'"><xsl:value-of select="'dd'"/></xsl:when>
+            <xsl:when test="$system_cache__dita:element='ph'"><xsl:value-of select="'ph'"/></xsl:when>
             
             <xsl:otherwise><xsl:message terminate="yes">#16 TODO undefined next element for <xsl:value-of select="$system_cache__dita:element"/></xsl:message></xsl:otherwise>
         </xsl:choose>

SE/schema/default_db_xml_cache.public/default_db/tree_to_dita.xsl

@@ -140,9 +140,9 @@
     <xsl:import href="tree_to_dita.files.xsl"/>
     <xsl:import href="tree_to_dita.element.xsl"/>
     <xsl:import href="tree_to_dita.localname.translate.xsl"/>
-    <xsl:import href="../dita_enter_to_ph.xsl"/>
+    <xsl:include href="../dita_enter_to_ph.xsl"/>
     
-    <xsl:include href="../default_db/enter_to_ph.xsl"/>
+    <!--<xsl:include href="../default_db/enter_to_ph.xsl"/>-->
     <xsl:include href="../truncate_special_and_do_uppercase.xsl"/>
     <xsl:include href="big_values_format.xsl"/>
     

SE/schema/default_db_xml_cache.public/dita_enter_to_ph.xsl

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:gml="http://www.opengis.net/gml" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:p5_default_db="https://biuro.biall-net.pl/wfs/default_db"
+    xmlns:default_db="https://biuro.biall-net.pl/wfs/default_db"
+    xmlns:wfs="http://www.opengis.net/wfs"
+    xmlns:ogc="http://www.opengis.net/ogc"
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+    xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
     exclude-result-prefixes="xs"
     version="2.0">
     
@@ -47,15 +55,25 @@
         </xsl:variable>
         <xsl:choose>
             <xsl:when test=" contains(  text(),'&#13;')">
+                <!--<xsl:message>#32 contains <xsl:value-of select="text()"/> 13; and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
                 <xsl:for-each select="tokenize(  text(),'&#13;')">
                     <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
                         <xsl:value-of select="."/>
                     </xsl:element>
                 </xsl:for-each>
             </xsl:when>
+            <xsl:when test=" contains(  text(),'&#xD;')">
+                <!--<xsl:message>#39 contains <xsl:value-of select="text()"/> xD;  and will surround with <xsl:value-of select="$surround_with"/>; </xsl:message>-->
+                <xsl:for-each select="tokenize(  text(),'&#xD;')">
+                    <xsl:element name="{$surround_with}"><!-- to jest przetwarzane jak jest tekst lamany -->
+                        <xsl:value-of select="."/>
+                    </xsl:element>
+                </xsl:for-each>
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:choose>
                     <xsl:when test="$count &gt;1">
+                        <!--<xsl:message>#50 codeblock with <xsl:value-of select="text()"/></xsl:message>-->
                         <codeblock>
                             <!--<xsl:attribute name="DDxpath" select="@xpath"/>-->
                             <!--DN(<xsl:value-of select="$element"/>)-->
@@ -64,6 +82,7 @@
                         </codeblock>
                     </xsl:when>
                     <xsl:otherwise>
+                        <xsl:message>#58 otherwise</xsl:message>
                         <xsl:apply-templates mode="enter_to_ph_text">
                             <xsl:with-param name="element" select="$element"/>
                         </xsl:apply-templates>
@@ -92,6 +111,41 @@
     </xsl:template>
     
     
+    
+    
+    <!--<xsl:template name="test">
+        <xsl:variable name="test">
+            <test>
+            AAA W ramach niniejszego porozumienia Strony zobowiązują się do:&#xD;
+            &#xD;
+            §1 ZOBOWIĄZANIA BIALL-NET SP. Z O.O.&#xD;
+            &#xD;
+            1. BIALL-NET Sp. z o.o. zobowiązuje się do wystawienia faktury korygującej do dokumentu nr FS 16/RFV/07/2016 z dnia 2016-07-14 na kwotę -15 559,94 zł brutto (słownie: - piętnaście tysięcy pięćset pięćdziesiąt dziewięć złotych 94/100) oraz anulowania naliczonych odsetek ustawowych z tytułu opóźnienia za płatności w kwocie 862,62 zł brutto (słownie: osiemset sześćdziesiąt dwa złote 62/100) wskazanych w przedsądowym wezwaniu do zapłaty o numerze 0-499-3136-3141-3493-59911/17 z dnia 2017-03-14, pomniejszając w ten sposób zobowiązanie firmy Vectra S.A. z tytułu płatności za fakturę nr FS 16/RFV/07/2016 do kwoty 0,00 zł (słownie: zero złotych 00/100).  Faktura korygująca zostanie wystawiona po dokonaniu płatności z tytułu §2.&#xD;
+            &#xD;
+            2. BIALL-NET Sp. z o.o. zobowiązuje się do wystawienia faktury korygującej do dokumentu nr FS 18/RFV/08/2016 z dnia 2016-08-02 na kwotę -38 184,53 zł brutto (słownie: - trzydzieści osiem tysięcy sto osiemdziesiąt cztery złote 53/100) oraz anulowania naliczonych odsetek ustawowych z tytułu opóźnienia za płatności w kwocie 2087,07 zł brutto (słownie: dwa tysiące osiemdziesiąt siedem złotych 07/100) wskazanych w przedsądowym wezwaniu do zapłaty o numerze 0-499-3136-3141-3493-59911/17 z dnia 2017-03-14, pomniejszając w ten sposób zobowiązanie firmy Vectra S.A. z tytułu płatności za fakturę nr FS 18/RFV/08/2016 do kwoty 0,00 zł (słownie: zero złotych 00/100). Faktura korygująca zostanie wystawiona po dokonaniu płatności z tytułu §2.&#xD;
+            &#xD;
+            §2 ZOBOWIĄZANIA VECTRA S.A. &#xD;
+            &#xD;
+            1. VECTRA S.A. zobowiązuje się do uiszczenia opłaty w kwocie 60 tys. zł netto (słownie: sześćdziesiąt tysięcy złotych 00/100) w terminie 7 dni od dnia podpisania niniejszego porozumienia na poczet udzielenia licencji systemu Procesy5 i przeprowadzenia wdrożenia przez firmę BIALL-NET Sp. z o.o. , dokładniej określonego w §3 niniejszego porozumienia. &#xD;
+            &#xD;
+            §3 ZOBOWIĄZANIA STRON&#xD;
+            &#xD;
+            1. STRONY zobowiązują się do podpisania umowy na udzielenie licencji systemu Procesy5 wraz z wdrożeniem, gdzie Zleceniobiorcą będzie firma BIALL-NET Sp. z o.o., a Zleceniodawcą firma VECTRA S.A. &#xD;
+            &#xD;
+            2. Wynagrodzenie należne z tytułu umowy określonej w §3 pkt. 1 wynosić będzie 60 tys. złotych netto (słownie: sześćdziesiąt tysięcy złotych 00/100), z czego 50 tys. złotych zostanie przeznaczone na udzielenie licencji systemu Procesy5, a 10 tys. na jego wdrożenie.&#xD;
+            &#xD;
+            3. Według wstępnych ustaleń z spotkania w siedzibie firmy Limes Sp. z o.o. z panem Tomaszem Łukiańczykiem z firmy VECTRA S.A. z dnia 2017-03-29 w Gdańsku zakres przedmiotu zobowiązania określonego w §3 pkt.1 powinien obejmować zakres licencji:&#xD;
+            &#xD;
+            a) Wersja Procesy5 dla jednej domeny użytkowania systemu dla Klienta dla nieograniczonej liczby serwerów oraz baz danych&#xD;
+            b) konfiguracja oraz uruchomienie / względnie dostarczenie wersji instalacyjnej systemu / współpraca podczas uruchomienia&#xD;
+            c) dostosowanie wersji systemu Procesy5 do działania na wirtualizowanym środowisku określonym przez wymagania Zleceniodawcy  (obecnie jest przetestowany do działania na systemach BSD oraz prekonfigurowanych pakietach open-source, zoptymalizowanych przez Apple w ramach popularnego pakietu OSX Server.)&#xD;
+            d) wykonanie kustomizacji systemu Procesy5 dla przedstawionych potrzeb wykonywania wycen przez sprzedawców firmy LIMES Sp. z o.o. (proces od wyceny do oferty)&#xD;
+            e) zostanie dostarczone towarzyszące oprogramowanie dla Android umożliwiające pracę mobilną dla jednostek wykonujących wyceny.&#xD;
+            </test>
+        </xsl:variable>
+        <xsl:apply-templates mode="enter_to_ph" select="$test"/>
+    </xsl:template>-->
+    
     <xsl:template match="*" mode="dita_content_clean">
         <xsl:value-of select="text()"/>
         <xsl:apply-templates mode="dita_content_clean"/>

SE/schema/default_db_xml_cache.public/get_all_xsd.xsl

@@ -658,6 +658,15 @@
                                 </system_cache__appinfo:get_all_xsd.default_db_xml_cache.public>
                             </xsl:when>
                             
+                            <!--<xsl:when test=" contains(document-uri(/), concat($default_db.dir,'/Types'))  ">
+                                <xsl:comment>#662T NOT ignored  schema by contains(document-uri(/), $default_db.dir/Types) == (<xsl:value-of select="$default_db.dir"/> + /Types) (<xsl:value-of select="document-uri(/)"/>)</xsl:comment>
+                                <system_cache__appinfo:get_all_xsd_default_db>
+                                    <xsl:attribute name="system_cache__appinfo:document-uri" select="substring-after(document-uri(/), $default_db.dir)"/>
+                                    <xsl:attribute name="system_cache__appinfo:document-uri-full" select="document-uri(/)"/>
+                                    <xsl:copy-of select="/"/>
+                                </system_cache__appinfo:get_all_xsd_default_db>
+                            </xsl:when>-->
+                            
                             <xsl:when test=" contains(document-uri(/), concat($default_db.dir,'/'))  ">
                                 <xsl:comment>#617A NOT ignored  schema by contains(document-uri(/), $default_db.dir) == (<xsl:value-of select="$default_db.dir"/> + /) (<xsl:value-of select="document-uri(/)"/>)</xsl:comment>
                                 <system_cache__appinfo:get_all_xsd_default_db>
@@ -763,15 +772,24 @@
                       </system_cache__appinfo:get_all_xsd>
                       <system_cache__appinfo:get_all_xsd>
                           <xsl:attribute name="system_cache__appinfo:document-uri" select="'http://biuro.biall-net.pl/p5/schema/types'"/>
+                          <xsl:copy-of  select="$system_cache__appinfo:p5Type.xsd//@system_cache__appinfo:document-uri"/>
                           <xsl:attribute name="system_cache__appinfo:document-uri-full" select="'http://biuro.biall-net.pl/p5/schema/types'"/>
                           <xsl:copy-of select="$system_cache__appinfo:p5Type.xsd"/>
                       </system_cache__appinfo:get_all_xsd>
+                        <system_cache__appinfo:get_all_xsd>
+                            <xsl:attribute name="system_cache__appinfo:document-uri" select="'https://biuro.biall-net.pl/wfs'"/>
+                            <xsl:copy-of  select="$system_cache__appinfo:p5.xsd//@system_cache__appinfo:document-uri"/>
+                            <xsl:attribute name="system_cache__appinfo:document-uri-full" select="'https://biuro.biall-net.pl/wfs'"/>
+                            <xsl:copy-of select="$system_cache__appinfo:p5.xsd"/>
+                        </system_cache__appinfo:get_all_xsd>
+                        
+                        
                   </system_cache__appinfo:get_all_xsd_list>
                 </xsl:variable>
                 <!--<xsl:result-document href="{concat('../default_db.instance.xml/transformed/',$element-filename,'.xml')}">
                     <xsl:copy-of select="$procesy5_system_schema"/>
                 </xsl:result-document>-->
-                <xsl:copy-of select="$procesy5_system_schema"></xsl:copy-of>
+                <xsl:copy-of select="$procesy5_system_schema"/>
             </xsl:otherwise>
         </xsl:choose>          
     </xsl:template>

SE/schema/default_db_xml_cache.public/xml-schema-primitives.xsl

@@ -7,7 +7,9 @@
     exclude-result-prefixes="xs"
     version="2.0">
     
-    
+   <xsl:include href="../Types/types.variable.xsl"/>
+   <xsl:include href="../Types/p5.variable.xsl"/>
+   
    <xsl:variable name="system_cache__appinfo:primitives.xsd">
       
       <!-- xmlns:p5="https://biuro.biall-net.pl/wfs" and xmlns:p5Type="https://biuro.biall-net.pl/wfs/p5Type" -->
@@ -3857,7 +3859,7 @@ use</xs:documentation>
          
       </xs:schema>
    </xsl:variable>
-   <xsl:variable name="system_cache__appinfo:p5Type.xsd">
+   <!--<xsl:variable name="system_cache__appinfo:p5Type.xsd">
       <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
          xmlns:p5TypeParam="http://biuro.biall-net.pl/p5/schema/typeParams"
          xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
@@ -3869,9 +3871,9 @@ use</xs:documentation>
          xmlns:p5opr="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/object_parent_relations/object_parent_relations.xsd"
          xmlns:p5_simpleSchema_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/p5_simpleSchema_map.xsd"
          elementFormDefault="qualified"
-         targetNamespace="http://biuro.biall-net.pl/p5/schema/types"><!--<xs:import namespace="http://biuro.biall-net.pl/p5/schema/typeParams" schemaLocation=""/>
+         targetNamespace="http://biuro.biall-net.pl/p5/schema/types"><!-\-<xs:import namespace="http://biuro.biall-net.pl/p5/schema/typeParams" schemaLocation=""/>
 	@2018-03-23 bindera: widze, ze tego nie ma i raczej jest niepotrzebne?
-	-->
+	-\->
          <xs:simpleType name="string" id="p___d15e99718-1_string">
             <xs:restriction base="xs:string"/>
          </xs:simpleType>
@@ -3964,7 +3966,7 @@ use</xs:documentation>
                <xs:enumeration value="CURRENT_TIMESTAMP"/>
             </xs:restriction>
          </xs:simpleType>
-         <!--
+         <!-\-
 TODO: Geometry
 TODO: MultiPolygon
 TODO: MultiPoint
@@ -3975,7 +3977,7 @@ TODO: GeometryCollection
 		<gml:polygonMember>
 			<gml:Polygon>
 	...
--->
+-\->
          <xs:simpleType name="geometry" id="p___d15e99779-1_geometry">
             <xs:restriction base="xs:string"/>
          </xs:simpleType>
@@ -3995,6 +3997,6 @@ TODO: GeometryCollection
             </xs:restriction>
          </xs:simpleType>
       </xs:schema>
-   </xsl:variable>
+   </xsl:variable>-->
 
 </xsl:stylesheet>

SE/schema/types.xsd

@@ -1,110 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:p5TypeParam="http://biuro.biall-net.pl/p5/schema/typeParams"
-           xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
-           xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
-           xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
-           xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
-           xmlns:p5opr="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/object_parent_relations/object_parent_relations.xsd"
-           xmlns:p5_simpleSchema_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/p5_simpleSchema_map.xsd"
-           elementFormDefault="qualified"
-           targetNamespace="http://biuro.biall-net.pl/p5/schema/types"><!--<xs:import namespace="http://biuro.biall-net.pl/p5/schema/typeParams" schemaLocation=""/>
+   xmlns:p5TypeParam="http://biuro.biall-net.pl/p5/schema/typeParams"
+   xmlns:p5Type="http://biuro.biall-net.pl/p5/schema/types"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
+   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+   xmlns:system_cache__resources_tree_generate_xsl_required_occurs_raport="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/resources_tree_generate_xsl_require_occurs_raport"
+   xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+   xmlns:p5opr="http://biuro.biall-net.pl/xmlschema_procesy5/system_cache/object_parent_relations/object_parent_relations.xsd"
+   xmlns:p5_simpleSchema_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/p5_simpleSchema_map.xsd"
+   elementFormDefault="qualified" targetNamespace="http://biuro.biall-net.pl/p5/schema/types">
+   <!--<xs:import namespace="http://biuro.biall-net.pl/p5/schema/typeParams" schemaLocation=""/>
 	@2018-03-23 bindera: widze, ze tego nie ma i raczej jest niepotrzebne?
 	-->
-   <xs:simpleType name="string" id="p___d15e2896-1_string">
-      <xs:restriction base="xs:string"/>
-   </xs:simpleType>
-   <xs:simpleType name="text" id="p___d15e2898-1_text">
-      <xs:restriction base="xs:string"/>
-   </xs:simpleType>
-   <xs:simpleType name="enumeration" id="p___d15e2900-1_enumeratio">
-      <xs:restriction base="xs:string"/>
-   </xs:simpleType>
-   <xs:simpleType name="set" id="p___d15e2902-1_set">
-      <xs:annotation>
-         <xs:documentation>
-Example appinfo for `CRM_PRZYPADEK`.`FORM_TREAT` field defined as set('', 'R', 'W', 'X', 'C', 'S', 'O', 'V', 'E'):
-<xs:appinfo>
-               <p5TypeParam:param name="enumeration">
-                  <p5TypeParam:enumeration value="0" label="" description="Brak"/>
-                  <p5TypeParam:enumeration value="2" label="R" description="Read"/>
-                  <p5TypeParam:enumeration value="4" label="W" description="Write"/>
-                  <p5TypeParam:enumeration value="8" label="X" description="Execute"/>
-                  <p5TypeParam:enumeration value="16" label="C" description="Create"/>
-                  <p5TypeParam:enumeration value="32" label="S" description="..."/>
-                  <p5TypeParam:enumeration value="64" label="O" description="..."/>
-                  <p5TypeParam:enumeration value="124" label="V" description="..."/>
-                  <p5TypeParam:enumeration value="256" label="E" description="Export"/>
-               </p5TypeParam:param>
-            </xs:appinfo>
-
-SELECT ID, `FORM_TREAT`, CAST(`FORM_TREAT` AS UNSIGNED) FROM `CRM_PRZYPADEK`;
-
-	IF 8 == 'X' THEN
-		insert into `CRM_PRZYPADEK`(`FORM_TREAT`) values('X');
-	IS EQUAL TO
-		insert into `CRM_PRZYPADEK`(`FORM_TREAT`) values(8);
-
-			</xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="xs:integer"/>
-   </xs:simpleType>
-   <xs:simpleType name="integer" id="p___d15e2919-1_integer">
-      <xs:restriction base="xs:integer"/>
-   </xs:simpleType>
-   <xs:simpleType name="decimal" id="p___d15e2921-1_decimal">
-      <xs:restriction base="xs:decimal"/>
-   </xs:simpleType>
-   <xs:simpleType name="double" id="p___d15e2923-1_double">
-      <xs:restriction base="xs:double"/>
-   </xs:simpleType>
-   <xs:simpleType name="float" id="p___d15e2925-1_float">
-      <xs:restriction base="xs:double"/>
-   </xs:simpleType>
-   <xs:simpleType name="binary" id="p___d15e2927-1_binary">
-      <xs:restriction base="xs:hexBinary"/>
-   </xs:simpleType>
-   <xs:simpleType name="hexBinary" id="p___d15e2929-1_hexBinary">
-      <xs:restriction base="xs:hexBinary"/>
-   </xs:simpleType>
-   <xs:simpleType name="date" id="p___d15e2932-1_date">
-      <xs:union memberTypes="xs:date p5Type:dateZero"/>
-   </xs:simpleType>
-   <xs:simpleType name="dateZero" id="p___d15e2934-1_dateZero">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="0000-00-00"/>
-         <xs:enumeration value="CURRENT_TIMESTAMP"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType name="dateTime" id="p___d15e2938-1_dateTime">
-      <xs:union memberTypes="xs:dateTime p5Type:dateTimeZero"/>
-   </xs:simpleType>
-   <xs:simpleType name="dateTimeZero" id="p___d15e2940-1_dateTimeZe">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="0000-00-00 00:00:00"/>
-         <xs:enumeration value="CURRENT_TIMESTAMP"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType name="time" id="p___d15e2944-1_time">
-      <xs:union memberTypes="xs:time p5Type:timeZero"/>
-   </xs:simpleType>
-   <xs:simpleType name="timeZero" id="p___d15e2946-1_timeZero">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="00:00:00"/>
-         <xs:enumeration value="CURRENT_TIMESTAMP"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType name="year" id="p___d15e2950-1_year">
-      <xs:union memberTypes="xs:gYear p5Type:yearZero"/>
-   </xs:simpleType>
-   <xs:simpleType name="yearZero" id="p___d15e2952-1_yearZero">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="0000"/>
-         <xs:enumeration value="CURRENT_TIMESTAMP"/>
-      </xs:restriction>
-   </xs:simpleType>
+   <xs:annotation>
+      <xs:documentation>Types should be in dir Types to be included in dependency calculations</xs:documentation>
+   </xs:annotation>
+   <xs:include schemaLocation="Types/types.xsd"/>
    <!--
 TODO: Geometry
 TODO: MultiPolygon
@@ -117,22 +29,4 @@ TODO: GeometryCollection
 			<gml:Polygon>
 	...
 -->
-   <xs:simpleType name="geometry" id="p___d15e2957-1_geometry">
-      <xs:restriction base="xs:string"/>
-   </xs:simpleType>
-   <xs:simpleType name="polygon" id="p___d15e2959-1_polygon">
-      <xs:restriction base="xs:string">
-         <xs:pattern value="(\-?\d+\.?\d*,-?\d+\.?\d*)( (\-?\d+\.?\d*,-?\d+\.?\d*))+"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType name="point" id="p___d15e2963-1_point">
-      <xs:restriction base="xs:string">
-         <xs:pattern value="\-?\d\.?\d*,\-?\d\.?\d*"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType name="lineString" id="p___d15e2966-1_lineString">
-      <xs:restriction base="xs:string">
-         <xs:pattern value="(\-?\d+\.?\d*,\-?\d+\.?\d*)( (\-?\d+\.?\d*,\-?\d+\.?\d*))+"/>
-      </xs:restriction>
-   </xs:simpleType>
 </xs:schema>