Browse Source

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda 8 years ago
parent
commit
6af674eb38

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

@@ -30,10 +30,9 @@
     <xsl:param name="threadCount" select="10"/>
     <xsl:param name="ant-launcher.jar" required="yes"/>
     <xsl:param name="debug_level_param"/>
-
-<!--<xsl:param name="external_schema_table.path" required="yes"/>-->        
+    <!--<xsl:param name="external_schema_table.path" required="yes"/>-->
+    
     
-
     <xsl:template mode="build_element_complexType.xml build_tr_map.xml" match="system_cache__appinfo:element_complexType"> <!-- for type generate in main build.xml mode -->
                 <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">
@@ -81,7 +80,7 @@
             <param name="default_db.instance.xml.symlink">
                 <xsl:attribute name="expression" select="'${default_db.instance.xml.symlink}'"/>
             </param>
-            <param name="vrtfNamespaces_file" >
+            <param name="vrtfNamespaces.xml" >
                 <xsl:attribute name="expression" select="'${vrtfNamespaces.xml}'"/>
             </param>
             <param name="procesy5_system_schema_file" >
@@ -134,7 +133,7 @@
                 <param name="default_db.instance.xml.symlink">
                     <xsl:attribute name="expression" select="'${default_db.instance.xml.symlink}'"/>
                 </param>
-                <param name="vrtfNamespaces_file" >
+                <param name="vrtfNamespaces.xml" >
                     <xsl:attribute name="expression" select="'${vrtfNamespaces.xml}'"/>
                 </param>
                 <param name="procesy5_system_schema_file" >

+ 68 - 6
SE/schema/default_db_xml_cache.public/build_object_install_se_ant_object.xsl

@@ -15,13 +15,13 @@
     
     
     <xsl:param name="NamespaceBinding.xml" required="yes"/> <!-- to set propery install prefix -->
-    <xsl:param name="vrtfNamespaces.xml" required="yes"/>
+    <!--<xsl:param name="vrtfNamespaces.xml" required="yes"/>-->
     <!--<xsl:param name="external_schema_table.path" required="yes"/>-->
     
     
     <xsl:variable name="NamespaceBinding" select="doc($NamespaceBinding.xml)"/>
     
-    <xsl:variable name="system_cache__appinfo:vrtfNamespaces" select="doc($vrtfNamespaces.xml)"/>
+    <!--<xsl:variable name="system_cache__appinfo:vrtfNamespaces" select="doc($vrtfNamespaces.xml)"/>-->
     
     
    
@@ -55,7 +55,7 @@
         </xsl:apply-templates>
     </xsl:template>
     
-    <xsl:template match="system_cache__appinfo:get_all_xsd[xs:schema/@targetNamespace='https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd']" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"> <!-- FILTERING [xs:schema/@targetNamespace='https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd'] -->
+    <xsl:template match="system_cache__appinfo:get_all_xsd" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"> <!-- FILTERING [xs:schema/@targetNamespace='https://biuro.biall-net.pl/wfs/default_db/table/ADMIN_USERS.xsd'] -->
         <xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external">
             <xsl:with-param name="system_cache__appinfo:document-uri-orig" select="@system_cache__appinfo:document-uri"/>
         </xsl:apply-templates>
@@ -435,6 +435,7 @@
             <xsl:element name="{name()}">
                 <xsl:copy-of select="@*"/>
                      <xsl:variable name="build_element_cache">
+                         <xsl:message>#458 calling system_cache__appinfo:build_element_cache for $targetNamespace=<xsl:value-of select="$targetNamespace"/>; </xsl:message>
                          <xsl:call-template name="system_cache__appinfo:build_element_cache">
                              <xsl:with-param name="element" select="@name"/>
                              <xsl:with-param name="prefix" select="$prefix"/>
@@ -469,12 +470,16 @@
     
     <!--<xsl:template match="complexType[ not(@name='sys_users') and not(@name='crm_families') and not(@name='crm_coordinators') and not(@name='crm_addressesfamilieslinks') and  ../.././name()='system_cache__appinfo:get_all_xsd_default_db']" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"/>--> <!-- not(@name='sys_users') and not(@name='crm_families') and not(@name='crm_coordinators') and not(@name='crm_addressesfamilieslinks') and -->
     
+    <xsl:template match="element[  ../.././name()='system_cache__appinfo:get_all_xsd_default_db']" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"> <!-- (@name='crm_families' or @name='crm_addressesfamilieslinks' or @name='crm_coordinators' or @name='sys_users') and -->
+        <xsl:message>#474 bypassed ROOT element/@name=<xsl:value-of select="@name"/></xsl:message>
+    </xsl:template>
+    
     <xsl:template match="complexType[  ../.././name()='system_cache__appinfo:get_all_xsd_default_db']" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external"> <!-- (@name='crm_families' or @name='crm_addressesfamilieslinks' or @name='crm_coordinators' or @name='sys_users') and -->
         <xsl:param name="prefix" required="yes"/>
         <xsl:param name="targetNamespace" required="yes"/>
         <xsl:param name="prefix_root"  required="yes"/>
         <xsl:param name="targetNamespace_root" required="yes"/>
-        
+        <!-- TODO testing @2017-12-13 if has run element -->
         <xsl:variable name="element" select="@name"/>
         <xsl:variable name="element-filename" >
             <xsl:choose>
@@ -512,6 +517,7 @@
                     <xsl:copy-of select="$prefixed_object_info"/>
                 </prefixed_object_info>
             </xsl:if>
+            <xsl:message>#516 NOT calling system_cache__appinfo:build_element_cache</xsl:message>
             <xsl:variable name="build_element_cache">
                 <xsl:copy-of select="."/>
             </xsl:variable>
@@ -577,7 +583,9 @@
                         </generate_tables_from_external_root.required_by.path_init>
                     </xsl:element>
                 </system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_root>
+                <xsl:message>#586 will element=<xsl:value-of select="$element"/>; (foreach) call system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = <xsl:value-of select="@system_cache__appinfo:xpath"/> in $targetNamespace=<xsl:value-of select="$targetNamespace"/>;</xsl:message>
                 <xsl:for-each-group select="../xs:complexType//system_cache__appinfo:flat_relation_cache[ system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = current()/@name ]" group-by="@system_cache__appinfo:name" >
+                    <xsl:message>#583 will ( IN foreach) call system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = <xsl:value-of select="@system_cache__appinfo:xpath"/></xsl:message>
                     <system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_root>
                         <xsl:attribute name="generate_tables_from_external_root.name" select="$generate_tables_from_external_root.name"/>
                         <xsl:attribute name="generate_tables_from_external_root.path" select="$generate_tables_from_external_root.path"/>
@@ -591,6 +599,7 @@
                             <xsl:attribute name="id" select="concat($id,'ct',@system_cache__appinfo:name)"/>
                             <xs:complexContent>
                                 <xs:extension>
+                                    <xsl:message>#600 calling concat($prefix,':',system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath)) with @system_cache__appinfo:xpath=(<xsl:value-of select="@system_cache__appinfo:xpath"/>)</xsl:message>
                                     <xsl:attribute name="base" select="concat($prefix,':',system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath))"/>
                                     <generate_tables_from_external_root.required_by.path_init>
                                         <xsl:attribute name="prefix" select="$prefix"/>
@@ -610,6 +619,7 @@
                         <xsl:element name="xs:element">
                             <xsl:attribute name="name" select="@system_cache__appinfo:name"/>
                             <xsl:attribute name="id" select="concat($id,'el',@system_cache__appinfo:name)"/>
+                            <xsl:message>#5621 will call system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = <xsl:value-of select="@system_cache__appinfo:xpath"/></xsl:message>
                             <xsl:attribute name="type" select="concat($prefix,':',system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath))"/>
                                     <generate_tables_from_external_root.required_by.path_init>
                                         <xsl:attribute name="prefix" select="$prefix"/>
@@ -650,7 +660,7 @@
         </xsl:variable>
         <xsl:variable name="prefix_token" select="tokenize(system_cache__appinfo:translate_object_escaped_prefix_from_string($element-filename),':')"/>
         <xsl:variable name="translate_object_escaped_prefix_from_string" select="system_cache__appinfo:translate_object_escaped_prefix_from_string($element-filename)"/>
-        <xsl:message>#186 parsing CT: <xsl:value-of select="@name"/>  ; </xsl:message>
+        <!--<xsl:message>#186 parsing CT: <xsl:value-of select="@name"/>  ; </xsl:message>-->
         
         <system_cache__appinfo:build_complexType>
             <xsl:copy-of select="@*"/>
@@ -667,6 +677,7 @@
             </prefixed_object_info>
             </xsl:if>
             <xsl:variable name="build_element_cache">
+                <xsl:message>#671 calling system_cache__appinfo:build_complexType_cache</xsl:message>
                 <xsl:call-template name="system_cache__appinfo:build_complexType_cache">
                     <xsl:with-param name="complexType" select="@name"/>
                     <xsl:with-param name="prefix" select="$prefix"/>
@@ -1594,6 +1605,40 @@
             </xsl:element>
     </xsl:template>
     
+    <xsl:template match="simpleType" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child.get_all_xsd_default_db" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:param name="generate_tables_from_external_root.name" select="@name"/>
+        <xsl:param name="generate_tables_from_external_root.path" select="@name"/>
+        <xsl:param name="targetNamespace" required="yes"/>
+        <xsl:param name="prefix" required="yes"/>
+        <xsl:param name="prefix_root"  required="yes"/>
+        <xsl:param name="targetNamespace_root" required="yes"/>
+        
+        <system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_root>
+            <xsl:attribute name="generate_tables_from_external_root.name" select="$generate_tables_from_external_root.name"/>
+            <xsl:attribute name="generate_tables_from_external_root.path" select="$generate_tables_from_external_root.path"/>
+            <xsl:attribute name="prefix" select="$prefix"/>
+            <xsl:attribute name="targetNamespace" select="$targetNamespace"/>
+            <xsl:attribute name="prefix_root" select="$prefix_root"/>
+            <xsl:if test="number($debug_level) &gt; 3"><xsl:attribute name="debug" select="'#1644'"/></xsl:if>
+            <xsl:element name="{name()}">
+                <xsl:copy-of select="@*"/>
+                <xsl:copy-of select="*"/>
+                <xsl:choose>
+                    <xsl:when test="@base">
+                        <xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child.get_all_xsd_default_db" select=" root()//system_cache__appinfo:get_all_xsd_default_db/schema[@targetNamespace=$targetNamespace_root]/simpleType[@name= system_cache__appinfo:clean_object_prefix(current()/@base)]">
+                            <xsl:with-param name="prefix" select="$prefix"/>
+                            <xsl:with-param name="targetNamespace" select="$targetNamespace"/>
+                            <xsl:with-param name="prefix_root" select="$prefix_root"/>
+                            <xsl:with-param name="targetNamespace_root" select="$targetNamespace_root"/>
+                        </xsl:apply-templates>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:element>
+        </system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_root>
+        
+    </xsl:template>
+    
+    
     <xsl:template match="element[@type ]" mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child.get_all_xsd_default_db" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="generate_tables_from_external_root.name" select="@type"/>
         <xsl:param name="generate_tables_from_external_root.path" select="@type"/>
@@ -1610,15 +1655,32 @@
                     <xsl:comment>#203aB - type typu xs:</xsl:comment>
                     <!--<xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child_force_refered_element" select="."/>-->
                 </xsl:when>
+                <xsl:when test=" root()//system_cache__appinfo:get_all_xsd_default_db/schema[@targetNamespace=$targetNamespace_root]/simpleType[@name= system_cache__appinfo:clean_object_prefix(current()/@type)]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+                    <xsl:copy-of select="@*"/>
+                    <xsl:if test="number($debug_level) &gt; 3"><xsl:attribute name="debug.203aB">#203aB - type typu xs: v</xsl:attribute></xsl:if>
+                    
+                    <xsl:variable name="targetNamespace" select="system_cache__appinfo:object_install_se_ant_object.create_targetNamespace($targetNamespace, @name )"/>
+                    <xsl:variable name="prefix" select="system_cache__appinfo:object_install_se_ant_object.create_prefix($prefix,@name)"/>
+                    <xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child.get_all_xsd_default_db" select=" root()//system_cache__appinfo:get_all_xsd_default_db/schema[@targetNamespace=$targetNamespace_root]/simpleType[@name= system_cache__appinfo:clean_object_prefix(current()/@type)]">
+                            <xsl:with-param name="prefix" select="$prefix"/>
+                            <xsl:with-param name="targetNamespace" select="$targetNamespace"/>
+                            <xsl:with-param name="prefix_root" select="$prefix_root"/>
+                            <xsl:with-param name="targetNamespace_root" select="$targetNamespace_root"/>
+                    </xsl:apply-templates>
+                    <!--<xsl:apply-templates mode="system_cache__appinfo:object_install_se_ant_object.generate_tables_from_external_child_force_refered_element" select="."/>-->
+                </xsl:when>
                 <xsl:otherwise>
+                    <xsl:message>#test 1641 child <xsl:value-of select=" root()//system_cache__appinfo:get_all_xsd_default_db/schema[@targetNamespace=$targetNamespace_root]/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
                     <xsl:if test="not(xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath)">
-                        <xsl:message terminate="yes">#1475 Unset xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath in @id:<xsl:value-of select="@id"/> element.</xsl:message>
+                        <xsl:message terminate="yes">FATAL ERROR ? #1475 not set xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath in @id:<xsl:value-of select="@id"/> element name=(<xsl:value-of select="@name"/>) @type=(<xsl:value-of select="@type"/>) generate_tables_from_external_root.path=(<xsl:value-of select="$generate_tables_from_external_root.path"/>) $targetNamespace=(<xsl:value-of select="$targetNamespace"/>)</xsl:message>
                     </xsl:if>
+                    <xsl:message>#1652 will call system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = <xsl:value-of select="xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath"/></xsl:message>
                     <xsl:variable name="prefix" select="system_cache__appinfo:object_install_se_ant_object.create_prefix($prefix_root,system_cache__appinfo:xpath.to.root_table(xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath))"/>
                     <xsl:attribute name="ref" select="concat($prefix,':',@name)"/>
                     <xsl:comment>#203bB - ref wymagac bedzie odtworzenia root/elenent dotyczacy tego refa. na bazie wszystkich uzytych system_cache__appinfo:flat_relation_cache[system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = current()/@name ]</xsl:comment>
                     <generate_tables_from_external_root.required_by.path_init>
                         <xsl:attribute name="prefix" select="$prefix"/>
+                        <xsl:message>#1658 will call system_cache__appinfo:xpath.to.root_table(@system_cache__appinfo:xpath) = <xsl:value-of select="xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath"/></xsl:message>
                         <xsl:attribute name="targetNamespace" select="system_cache__appinfo:object_install_se_ant_object.create_targetNamespace($targetNamespace_root,system_cache__appinfo:xpath.to.root_table(xs:annotation/xs:appinfo/system_cache__appinfo:flat_relation_cache/@system_cache__appinfo:xpath))"/>
                     </generate_tables_from_external_root.required_by.path_init>
                 </xsl:otherwise>

+ 89 - 0
SE/schema/default_db_xml_cache.public/build_qgis_make_user_style.xsl

@@ -0,0 +1,89 @@
+<?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:wfs="http://www.opengis.net/wfs"
+    xmlns:gml="http://www.opengis.net/gml"
+    xmlns:ogc="http://www.opengis.net/ogc"
+    xmlns:p5_tr_map="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd"
+    xmlns:sso_procesy5="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/struktura_silnika_obiektow_procesy5.xsd"
+    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:get_wfs_recurse_xsl="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl.xsd"
+    xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
+    xmlns:default_db="https://biuro.biall-net.pl/wfs/default_db"
+    xmlns:SystemObjects__x3A__layers="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/layers.xsd"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    
+    <xsl:output indent="yes"/>
+    <xsl:strip-space elements="*"/>
+    
+    <!--<xsl:param name="detect_objects_parent_relations.xml" required="yes"/>-->
+    
+    <!--<xsl:include href="../../../default_db_xml_cache.public/get_all_xsd.xsl"/>-->
+    <xsl:include href="../../../default_db_xml_cache/system_cache__resources_tree_generate_xsl_required_occurs_raport/detect_objects_parent_relations.xsl"/>
+    
+    <xsl:param name="public_html_xmslchema_procesy5_url"  select="'/dev/null'"/>
+    
+    
+    <xsl:template match="system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_objects_parent_relations"  mode="SystemObjects__x3A__layers:layers">
+        <test/>
+    </xsl:template>
+    <xsl:template match="system_cache__appinfo:detect_element_relations_to_objects_list" mode="sso_procesy5:create_object_navgation_menu">
+        <table border="1" bgcolor="yellow">
+            <tr>
+                <td>
+                    <font size="-2">Typy powiazane</font>
+                </td>
+                <xsl:apply-templates mode="#current"/>
+            </tr>
+        </table>
+    </xsl:template>
+    <xsl:template match="system_cache__appinfo:detect_element_relations_to_objects" mode="sso_procesy5:create_object_navgation_menu">
+        <td><font size="-3"><xsl:value-of select="@system_cache__appinfo:ref"/><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@system_cache__appinfo:ref)}/create_obj_form_html.php">(add)</a><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@system_cache__appinfo:ref)}/list_obj_form_html.php">(lista)</a></font></td>
+    </xsl:template>
+    <xsl:template match="system_cache__resources_tree_generate_xsl_required_occurs_raport:from_parent_relations" mode="sso_procesy5:create_object_navgation_menu">
+        <xsl:choose>
+            <xsl:when test="@local-name='element'">
+                <table border="2" bgcolor="green"><tr><td>
+                    <font size="-3">Obiekty dowiazujace niniejszy obiekt</font>
+                </td>
+                    <td><font size="-3"><xsl:value-of select="@parent_object"/><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@parent_object)}/create_obj_form_html.php">(add)</a><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@parent_object)}/list_obj_form_html.php">(lista)</a></font></td>
+                </tr>
+                </table>
+            </xsl:when>
+            <xsl:otherwise>
+                <table border="2" bgcolor="green"><tr><td>
+                    <font size="-3">Obiekty dowiazujace niniejszy obiekt - bez mozliwej instanacji w schemacie</font>
+                </td>
+                    <td><font size="-3"><xsl:value-of select="@parent_object"/></font></td>
+                </tr>
+                </table>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+    </xsl:template>
+    <xsl:template match="system_cache__resources_tree_generate_xsl_required_occurs_raport:parent_complexType_siblings" mode="sso_procesy5:create_object_navgation_menu">
+        <!--<table border="2" bgcolor="green"><tr><td>-->
+        <xsl:apply-templates mode="#current"/>
+        <!--</td>
+        </tr>
+        </table>-->
+    </xsl:template>
+    <xsl:template match="system_cache__appinfo:parent_complexType" mode="sso_procesy5:create_object_navgation_menu">
+        <xsl:if test="substring-before(@p5_tr_map:name_with_pref,':')='prove_portal' or substring-before(@p5_tr_map:name_with_pref,':')='test_objects' or substring-before(@p5_tr_map:name_with_pref,':')='moj_ogrodek' or 1=1"> <!-- TOTO DEBUG OGRANICZENIE-->
+            <table border="1" bgcolor="yellow">
+                <tr>
+                    <td>
+                        <font size="-2">Typy blizniacze <xsl:value-of select="@parent_complexType"/></font>
+                    </td>
+                    <xsl:apply-templates mode="#current"/>
+                </tr>
+            </table>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template match="system_cache__appinfo:parent_complexType_child" mode="sso_procesy5:create_object_navgation_menu">
+        <td><font size="-3"><xsl:value-of select="@p5_tr_map:name_with_pref"/><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@p5_tr_map:name_with_pref)}/create_obj_form_html.php">(add)</a><a href="{$public_html_xmslchema_procesy5_url}/default_db.instance.xml/sso_procesy5/{system_cache__appinfo:escape_object_prefix_to_string(@p5_tr_map:name_with_pref)}/list_obj_form_html.php">(lista)</a></font></td>
+    </xsl:template>
+    <xsl:template match="*|comment()" mode="sso_procesy5:create_object_navgation_menu"/>
+    
+</xsl:stylesheet>

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

@@ -21,6 +21,12 @@
     <xsl:param name="default_db.dir" select="'/public_html/default_db/'"/>
     <xsl:param name="default_db_xml_cache.public" select="'/public_html/default_db_xml_cache.public/'"/>
     
+    <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>
+    
+    <xsl:param name="WPS_Functions" select="'public_html/WPS_Functions/'"/>
+    <xsl:param name="new-schema-with-ID-to-move-and-rename-to-xsd" select="'/new-schema-with-ID-to-move-and-rename-to-xsd'"/>
+    
+    
     <xsl:include href="../default_db_xml_cache.public/xml-schema-primitives.xsl"/>
     <xsl:include href="system_cache__appinfo/external_schema_targetNamespace.xsl"/>
     
@@ -108,6 +114,7 @@
     <xsl:function name="system_cache__appinfo:prefix_from_targetNamespace">
         <xsl:param name="system_cache__appinfo:vrtfNamespaces" />
         <xsl:param name="targetNamespace" />
+        <!--<xsl:message>#115 system_cache__appinfo:prefix_from_targetNamespace elements in system_cache__appinfo:vrtfNamespaces=<xsl:value-of select="count($system_cache__appinfo:vrtfNamespaces//ns)" xpath-default-namespace=""/></xsl:message>-->
         <xsl:value-of select="$system_cache__appinfo:vrtfNamespaces//ns[@uri=$targetNamespace][1]/@prefix" xpath-default-namespace=""/>
     </xsl:function>
     <xsl:function name="system_cache__appinfo:targetNamespace_from_prefix">
@@ -618,7 +625,7 @@
             </xsl:when>
             <xsl:otherwise>
                 <xsl:variable name="path">
-                    <xsl:value-of select="concat($path2collection,'?select=*.(xsd);recurse=yes;on-error=warning')"/> 
+                    <xsl:value-of select="concat($path2collection,'?select=*.(xsd);recurse=yes;on-error=fail;xinclude=no')"/> 
                 </xsl:variable>
                 <xsl:variable name="docs" select="collection($path)"/>
                 <xsl:variable name="procesy5_system_schema">
@@ -629,6 +636,9 @@
                             <xsl:when test="contains(document-uri(/),'/ant-object/')">
                                 <xsl:message>#519 ignored /ant-object for <xsl:value-of select="document-uri(/)"/>"/> ;</xsl:message>
                             </xsl:when>
+                            <xsl:when test="contains(document-uri(/),$new-schema-with-ID-to-move-and-rename-to-xsd)">
+                                <xsl:message>#638 ignored /ant-object for <xsl:value-of select="document-uri(/)"/>"/> ;</xsl:message>
+                            </xsl:when>
                             <xsl:when test=" contains(document-uri(/), concat($external_schema,'/'))">
                                 <xsl:comment>#145 Ignored /public_html/external_schema <xsl:value-of select="document-uri(/)"/></xsl:comment>
                                 <system_cache__appinfo:get_all_xsd_external_schema>
@@ -692,6 +702,10 @@
                                     <xsl:copy-of select="/"/>
                                 </system_cache__appinfo:get_all_xsd_external_schema_table>
                             </xsl:when>
+                            <xsl:when test=" contains(document-uri(/), $WPS_Functions)">
+                                <xsl:comment>#700 ignored  schema by contains(document-uri(/), $WPS_Functions)</xsl:comment>
+                                <xsl:message>#700 ignored  schema by contains(document-uri(/), $WPS_Functions)</xsl:message>
+                            </xsl:when>
                             <xsl:otherwise>
                                 <system_cache__appinfo:get_all_xsd>
                                     <xsl:attribute name="system_cache__appinfo:document-uri" select="substring-after(document-uri(/), '/public_html/')"/>

+ 65 - 13
SE/schema/default_db_xml_cache.public/get_wfs_recurse_xsl.xsl

@@ -4,6 +4,7 @@
     xmlns:wfs="http://www.opengis.net/wfs"
     xmlns:gml="http://www.opengis.net/gml"
     xmlns:ogc="http://www.opengis.net/ogc"
+    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:get_wfs_recurse_xsl="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/get_wfs_recurse_xsl.xsd"
     xmlns:system_cache__appinfo="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd"
     xmlns:default_db="https://biuro.biall-net.pl/wfs/default_db"
@@ -26,7 +27,7 @@
     
     <xsl:param name="username" select="'a.binder'"/>
     <xsl:param name="username.pass"  required="yes"/>
-    
+    <xsl:param name="php_session_id_ok.string"/>
     <xsl:param name="simpleSchema_dir" required="yes"/>
     
     <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/> <!-- TODO should be detected -->
@@ -60,6 +61,33 @@
         <xsl:value-of select="$get_wfs_recurse_xsl:GetsimpleSchema/(RelatedFeatureRoot|RelatedFeature)/RelatedFilter"/>
     </xsl:function>
     
+    <xsl:template name="get_wfs_recurse_xsl:request_string">
+        <xsl:param name="protocol" select="$protocol"/>
+        <xsl:param name="api" select="$api"/>
+        <xsl:param name="targetNamespace_DEFAULTS_prefix" select="$targetNamespace_DEFAULTS_prefix"/>
+        <xsl:param name="username" select="$username"/>
+        <xsl:param name="username.pass" select="$username.pass"/>
+        <xsl:param name="REQUEST.SERVICE" select="'WFS'"/>
+        <xsl:param name="REQUEST.VERSION" select="'1.0.0'"/>
+        <xsl:param name="REQUEST.TYPE" select="'GetFeature'"/>
+        <xsl:param name="REQUEST.TYPENAME"  required="yes"/>
+        <xsl:param name="OGC_Filter"/>
+        <xsl:param name="REQUEST.SRSNAME" select="'EPSG:3003'"/>
+        <xsl:variable name="php_session_id_ok.string">
+            <xsl:if test=" string-length($php_session_id_ok.string) &gt; 0">
+                <xsl:value-of select="concat('&amp;sid=',normalize-space($php_session_id_ok.string))"/>
+            </xsl:if>
+        </xsl:variable>
+        <xsl:variable name="username_and_pass">
+            <xsl:choose>
+                <xsl:when test="string-length($php_session_id_ok.string) &gt; 0"/>
+                <xsl:otherwise><xsl:value-of select="concat($username,':',$username.pass,'@')"/></xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="concat($protocol,$username_and_pass,$api,'/',$targetNamespace_DEFAULTS_prefix,'/?SERVICE=',$REQUEST.SERVICE,'&amp;VERSION=',$REQUEST.VERSION,'&amp;REQUEST=',$REQUEST.TYPE,'&amp;TYPENAME=',$REQUEST.TYPENAME,$php_session_id_ok.string,$OGC_Filter,'&amp;SRSNAME=',$REQUEST.SRSNAME)"/>
+    </xsl:template>
+    
+    
         
     <xsl:function name="get_wfs_recurse_xsl:simpleTypeMakeOgcFilter">
         <xsl:param name="get_wfs_recurse_xsl:GetsimpleSchema"/>
@@ -235,12 +263,22 @@
                        <xsl:copy-of select="$OGC_Filter"/>
                    </Filter>-->
         </xsl:if>
-        <xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/> <!-- &amp;MAXFEATURES=15 -->
-        <xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>
-        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($url_string)"/>
+        <!--<xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/>--> <!-- &amp;MAXFEATURES=15 -->
+        
+        <xsl:variable name="request_string">
+            <xsl:call-template name="get_wfs_recurse_xsl:request_string">
+                <xsl:with-param name="OGC_Filter" select="$OGC_Filter"/>
+                <xsl:with-param name="REQUEST.TYPE" select="'GetFeature'"/>
+                <xsl:with-param name="REQUEST.TYPENAME" select="$get_wfs_recurse_xsl:typeNameRealResource"/>
+            </xsl:call-template>
+        </xsl:variable>
+        
+        <!--<xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>-->
+        <xsl:message>#265 test $php_session_id_ok.string=<xsl:value-of select="$php_session_id_ok.string"/>; $url_string=<xsl:value-of select="$request_string"/> </xsl:message>
+        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($request_string)"/>
         <xsl:if test="$debug &gt; 5">
             <wfs_response>
-            <request>Retrieving <xsl:value-of select="$url_string"/></request>
+                <request>Retrieving <xsl:value-of select="$request_string"/></request>
                 <oryg>https://                     biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:CRM_PROCES&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</oryg>
                 <test>https://a.binder:@biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:PROCES_INIT&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</test>
                 
@@ -317,12 +355,19 @@
                           <xsl:copy-of select="$OGC_Filter"/>
                       </Filter>-->
         </xsl:if>
-        <xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/> <!-- &amp;MAXFEATURES=15 -->
-        <xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>
-        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($url_string)"/>
+        <!--<xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/>--> <!-- &amp;MAXFEATURES=15 -->
+        <xsl:variable name="request_string">
+            <xsl:call-template name="get_wfs_recurse_xsl:request_string">
+                <xsl:with-param name="OGC_Filter" select="$OGC_Filter"/>
+                <xsl:with-param name="REQUEST.TYPE" select="'GetFeature'"/>
+                <xsl:with-param name="REQUEST.TYPENAME" select="$get_wfs_recurse_xsl:typeNameRealResource"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <!--<xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>-->
+        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($request_string)"/>
         <xsl:if test="$debug &gt; 5">
             <wfs_response>
-                <request>Retrieving <xsl:value-of select="$url_string"/></request>
+                <request>Retrieving <xsl:value-of select="$request_string"/></request>
                 <oryg>https://                     biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:CRM_PROCES&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</oryg>
                 <test>https://a.binder:@biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:PROCES_INIT&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</test>
                 <xsl:copy-of select="$get_wfs_recurse_xsl:wfs_response//gml:featureMember[1]"/>
@@ -382,12 +427,19 @@
                       <xsl:copy-of select="$OGC_Filter"/>
                   </Filter>-->
         
-        <xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/> <!-- &amp;MAXFEATURES=15 -->
-        <xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>
-        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($url_string)"/>
+        <!--<xsl:variable name="request_string" select="concat('?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=',$get_wfs_recurse_xsl:typeNameRealResource,$OGC_Filter,'&amp;SRSNAME=EPSG:3003')"/>--> <!-- &amp;MAXFEATURES=15 -->
+        <xsl:variable name="request_string">
+            <xsl:call-template name="get_wfs_recurse_xsl:request_string">
+                <xsl:with-param name="OGC_Filter" select="$OGC_Filter"/>
+                <xsl:with-param name="REQUEST.TYPE" select="'GetFeature'"/>
+                <xsl:with-param name="REQUEST.TYPENAME" select="$get_wfs_recurse_xsl:typeNameRealResource"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <!--<xsl:variable name="url_string" select="concat($protocol,$username,':',$username.pass,'@',$api,'/',$targetNamespace_DEFAULTS_prefix,'/',$request_string)"/>-->
+        <xsl:variable name="get_wfs_recurse_xsl:wfs_response" select="doc($request_string)"/>
         <xsl:if test="$debug &gt; 4">
             <wfs_response>
-                <request>Retrieving <xsl:value-of select="$url_string"/></request>
+                <request>Retrieving <xsl:value-of select="$request_string"/></request>
                 <oryg>https://                     biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:CRM_PROCES&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</oryg>
                 <test>https://a.binder:@biuro.biall-net.pl/SE/version-git/wfs-data.php/default_db/?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=GetFeature&amp;TYPENAME=p5_default_db:PROCES_INIT&amp;SRSNAME=EPSG:3003&amp;MAXFEATURES=15</test>
                <!-- <debug_child_loop>-->

+ 64 - 10
SE/schema/default_db_xml_cache.public/main_build_recurse_ant.dita_with_id.xsl

@@ -25,6 +25,22 @@
     <xsl:output indent="yes" />
     <xsl:strip-space elements="*"/>
     
+    <xsl:function name="system_cache__resources_tree_generate_xsl_required_occurs_raport:GetsimpleSchema">
+        <xsl:param name="typeNameRealResource"/>
+        <xsl:variable name="featureID_name_dita" select="substring-after($typeNameRealResource,':')"/>
+        <xsl:choose>
+            <xsl:when test=" doc-available(concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml'))">
+                <xsl:variable name="simpleSchemaFile" select="concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml')"/>
+                <xsl:message>get_wfs_recurse_xsl:GetsimpleSchema: <xsl:value-of select="$simpleSchemaFile"/></xsl:message>
+                <xsl:copy-of select="doc($simpleSchemaFile)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>#38 ERROR with not generated file should be - maybe do again build.xml? missing file: <xsl:value-of select="concat($simpleSchema_dir,'/',$targetNamespace_DEFAULTS_prefix,'/',$featureID_name_dita,'.xml')"/></xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+        
+    </xsl:function>
+    
     <xsl:function name="p5_tr_map:force_local_typeName">
         <xsl:param name="typeName"/>
         <xsl:choose>
@@ -209,7 +225,7 @@
                                              <xsl:copy-of select="$detect_resource_type"/>
                                          </prefixed_object_info>-->
                     <!--<debug208>
-                        <xsl:copy-of select="$detect_resource_type"/>
+                        <xsl:copy-of select="$build_complexType"/>
                     </debug208>-->
                     
                     
@@ -279,6 +295,7 @@
                 <!--<prefixed_object_info>
                          <xsl:copy-of select="$detect_resource_type"/>
                      </prefixed_object_info>-->
+                <xsl:comment>@298 p5_tr_map:simpleTypeMakeOgcFilter</xsl:comment>
                 <xsl:call-template name="p5_tr_map:simpleTypeMakeOgcFilter">
                     <xsl:with-param name="build_complexType" select="$build_complexType"/>
                 </xsl:call-template>
@@ -457,18 +474,41 @@
         <xsl:variable name="simpleTypeMakeOgcFilter">
             <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter" select="$build_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
         </xsl:variable>
+        <!--<debug.476>
+            <xsl:copy-of select="$build_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+        </debug.476>-->
         <xsl:if test="$simpleTypeMakeOgcFilter/*"><!-- display element only if exists filter -->
             <simpleTypeMakeOgcFilter>
                 <xsl:attribute name="name" select="$build_complexType/element/@name" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+                <!--<xsl:attribute name="debug.479" select="true()"/>-->
                 <xsl:copy-of select="$simpleTypeMakeOgcFilter"/>
             </simpleTypeMakeOgcFilter>
         </xsl:if>
         
     </xsl:template>
     
-    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="sequence|complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <!--<xsl:element name="{name()}">-->
+            <xsl:variable name="p5_tr_map:simpleTypeMakeOgcFilter"><!-- to test only -->
+                <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="count($p5_tr_map:simpleTypeMakeOgcFilter/*) &gt; 1">
+                    <ogc:And>
+                        <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter"/>
+                    </ogc:And>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        <!--<xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>-->
+        <!--</xsl:element>-->
+    </xsl:template>
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <!--<xsl:element name="{name()}">-->
-            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
+        <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
         <!--</xsl:element>-->
     </xsl:template>
     
@@ -494,9 +534,23 @@
     
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="restriction[@base]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
-        <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
-            <xsl:with-param name="name" select="$name"/>
-        </xsl:apply-templates>
+        <xsl:variable name="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+                <xsl:with-param name="name" select="$name"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="count($p5_tr_map:simpleTypeMakeOgcFilter_restriction/*) &gt; 1">
+                <xsl:for-each select="$p5_tr_map:simpleTypeMakeOgcFilter_restriction">
+                    <ogc:Or>
+                        <xsl:copy-of select="*"/>
+                    </ogc:Or>
+                </xsl:for-each>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy-of select="$p5_tr_map:simpleTypeMakeOgcFilter_restriction"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     
@@ -504,23 +558,23 @@
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction" match="enumeration" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
         <!--c:Filter&gt;&lt;ogc:And&gt;&lt;ogc:PropertyIsEqualTo&gt;&lt;ogc:Propert -->
-        <ogc:Or>
+        <!--<ogc:Or>-->
             <ogc:PropertyIsEqualTo>
                 <ogc:PropertyName><xsl:value-of select="$name"/></ogc:PropertyName>
                 <ogc:Literal><xsl:value-of select="@value"/></ogc:Literal>
             </ogc:PropertyIsEqualTo>
-        </ogc:Or>
+        <!--</ogc:Or>-->
     </xsl:template>
     
     <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction" match="minInclusive" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="name" required="yes"/>
         <!--c:Filter&gt;&lt;ogc:And&gt;&lt;ogc:PropertyIsEqualTo&gt;&lt;ogc:Propert -->
-        <ogc:Or>
+        <!--<ogc:Or>-->
             <ogc:PropertyIsGreaterThanOrEqualTo>
                 <ogc:PropertyName><xsl:value-of select="$name"/></ogc:PropertyName>
                 <ogc:Literal><xsl:value-of select="@value"/></ogc:Literal>
             </ogc:PropertyIsGreaterThanOrEqualTo>
-        </ogc:Or>
+        <!--</ogc:Or>-->
     </xsl:template>
     
     

+ 57 - 3
SE/schema/default_db_xml_cache.public/object_modeling.xsl

@@ -14,19 +14,48 @@
     
     <xsl:param name="prototype_object_namespace" select="'https://biuro.biall-net.pl/wfs/default_db/Types/Infrastructure.xsd'"/>
     <xsl:param name="new_object_namespace"/> <!-- example https://biuro.biall-net.pl/wfs/default_db/table/CRM_PROCES.xsd -->
+    <xsl:param name="targetNamespace.base" required="yes"/>
+    <!--<xsl:param name="targetNamespace_DEFAULTS" select="'http://biuro.biall-net.pl/xmlschema_procesy5/default_db'"/>-->
     <!--<xsl:param name="procesy5_system_schema_collection_dir" select="'../../'"/>--> <!-- should be like /Users/a.binder/Documents/xmlschema_procesy5/src-xmlschema/public_html -->
     
     
+    <xsl:template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+        <xsl:param name="base"/>
+        <xsl:param name="prototype"/>
+        <xsl:for-each select="$base">
+            <xsl:choose>
+                <xsl:when test="$prototype[ not(@name=current()/@name) and not(name()=current()/name())]">
+                    <xsl:copy-of select="."/>
+                    <!--<xsl:element name="{name()}">
+                        <xsl:copy-of select="@*"/>
+                        <xsl:call-template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+                            <xsl:with-param name="base" select=""/>
+                            <xsl:with-param name="prototype"/>
+                        </xsl:call-template>
+                    </xsl:element>-->
+                </xsl:when>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
     
     <xsl:template match="system_cache__appinfo:get_all_xsd_list" mode="system_cache__appinfo:new_object_by_prototype">
+        <xsl:variable name="system_cache__appinfo:new_object_by_prototype.base" select="system_cache__appinfo:get_all_xsd_default_db/schema[ substring-after(@targetNamespace,'://')=substring-after($targetNamespace.base,'://')]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+        <xsl:if test="not($system_cache__appinfo:new_object_by_prototype.base/complexType)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"><xsl:message terminate="yes">#25 unknow source object - not found for <xsl:value-of select="$targetNamespace.base"/></xsl:message></xsl:if>
+        <xsl:message>#26 <xsl:value-of select="count($system_cache__appinfo:new_object_by_prototype.base/complexType)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+        <debug.45><xsl:copy-of select="$system_cache__appinfo:new_object_by_prototype.base" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></debug.45>
         <xsl:choose>
             <xsl:when test="$prototype_object_namespace and $new_object_namespace">
                 <xsl:variable name="system_cache__appinfo:new_object_by_prototype_test_if_prototype">
-                    <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_test_if_prototype"/>
+                    <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_test_if_prototype">
+                        <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                    </xsl:apply-templates>
                 </xsl:variable>
                 <xsl:choose>
                     <xsl:when test="$system_cache__appinfo:new_object_by_prototype_test_if_prototype/*">
-                        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype"/>
+                        <xsl:variable name="system_cache__appinfo:new_object_by_prototype.base" select="system_cache__appinfo:get_all_xsd_default_db/schema"/>
+                        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype">
+                            <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                        </xsl:apply-templates>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:message terminate="yes">#32 prototype <xsl:value-of select="$prototype_object_namespace"/> not exists in schema !  if it realy exiss consider rebuild procesy5_system_schema.xml !</xsl:message>
@@ -39,7 +68,10 @@
     </xsl:template>
     
     <xsl:template mode="system_cache__appinfo:new_object_by_prototype" match="system_cache__appinfo:get_all_xsd">
-        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype"/>
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
+        <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype">
+            <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
+        </xsl:apply-templates>
     </xsl:template>
     
     
@@ -56,6 +88,7 @@
     
     
     <xsl:template mode="system_cache__appinfo:new_object_by_prototype" match="schema[@targetNamespace=$prototype_object_namespace]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
         <xsl:variable name="prototype_TargetNamespaceBindings_from_Namespace">
             <xsl:call-template name="system_cache__appinfo:TargetNamespaceBindings_from_Namespace">
                 <xsl:with-param name="TargetNamespace" select="$prototype_object_namespace"/>
@@ -102,10 +135,26 @@
                             <xsl:copy-of select="namespace::node()"/>
                             <xsl:namespace name="{$new_TargetNamespaceBindings_from_Namespace//@NamespacePrefix}" select="$new_object_namespace"/>
                             <xsl:attribute name="targetNamespace" select="$new_object_namespace"/>
+                            <xsl:variable name="system_cache__appinfo:check_if_schema_element_exists_by_base" >
+                                <xsl:call-template name="system_cache__appinfo:check_if_schema_element_exists_by_base">
+                                    <xsl:with-param name="base" select="$system_cache__appinfo:new_object_by_prototype.base/*"/>
+                                    <xsl:with-param name="prototype" select="*"/>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <debug.143>
+                                <xsl:attribute name="base" select="$system_cache__appinfo:new_object_by_prototype.base/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" />
+                                <xsl:attribute name="prototype" select="name()"/>
+                                <xsl:copy-of select="$system_cache__appinfo:check_if_schema_element_exists_by_base"/>
+                            </debug.143>
+                            <debug.147.base>
+                                
+                                <xsl:copy-of select="$system_cache__appinfo:new_object_by_prototype.base"/>
+                            </debug.147.base>
                             <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_schema_root">
                                 <xsl:with-param name="prototype_TargetNamespaceBindings_from_Namespace" select="$prototype_TargetNamespaceBindings_from_Namespace"/>
                                 <xsl:with-param name="new_TargetNamespaceBindings_from_Namespace" select="$new_TargetNamespaceBindings_from_Namespace"/>
                                 <xsl:with-param name="prototype_NamespacePrefix" select="$prototype_NamespacePrefix"/>
+                                <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
                             </xsl:apply-templates>
                         </xsl:element>
                     </xsl:result-document>
@@ -125,7 +174,10 @@
         <xsl:param name="prototype_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="new_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="prototype_NamespacePrefix" required="yes"/>
+        <xsl:param name="system_cache__appinfo:new_object_by_prototype.base" required="yes"/>
+        
         <xsl:element name="{name()}">
+            <xsl:message>#145 debug name form prototype is <xsl:value-of select="$system_cache__appinfo:new_object_by_prototype.base/name()"/></xsl:message>
             <xsl:apply-templates select="@*" mode="system_cache__appinfo:new_object_by_prototype_schema_root">
                 <xsl:with-param name="prototype_TargetNamespaceBindings_from_Namespace" select="$prototype_TargetNamespaceBindings_from_Namespace"/>
                 <xsl:with-param name="new_TargetNamespaceBindings_from_Namespace" select="$new_TargetNamespaceBindings_from_Namespace"/>
@@ -145,6 +197,7 @@
         <xsl:param name="prototype_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="new_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="prototype_NamespacePrefix" required="yes"/>
+        <xsl:message>#200 matched <xsl:value-of select="name()"/></xsl:message>
         <xsl:element name="{name()}">
             <!--<xsl:attribute name="id" select="concat(substring($new_TargetNamespaceBindings_from_Namespace//@NamespaceObjectInstanceTable,0,15),'_',generate-id())"/>-->
         <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_schema_child">
@@ -159,6 +212,7 @@
         <xsl:param name="prototype_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="new_TargetNamespaceBindings_from_Namespace" required="yes"/>
         <xsl:param name="prototype_NamespacePrefix" required="yes"/>
+        <xsl:message>#215 matched <xsl:value-of select="name()"/>/<xsl:value-of select="@name"/></xsl:message>
         <xsl:element name="{name()}">
             <xsl:copy-of select="@minOccurs"/>
             <xsl:copy-of select="@maxOccurs"/>

+ 28 - 5
SE/schema/default_db_xml_cache.public/object_modeling_new_by_xml_schema.xsl

@@ -75,6 +75,7 @@
     
     <xsl:template mode="system_cache__appinfo:object_modeling_new_add_xml_schema" match="schema[@targetNamespace=$prototype_object_namespace]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:result-document href="{$template_object.xml_location}">
+            <xsl:message>#78 saving to <xsl:value-of select="$template_object.xml_location"/></xsl:message>
             <xsl:element name="xs:schema">
                 <xsl:copy-of select="namespace::node()"/>
                 <xsl:namespace name="{$new_TargetNamespaceBindings_from_Namespace//@NamespacePrefix}" select="$TargetNamespace_from_Bindings//@TargetNamespace"/>
@@ -87,21 +88,37 @@
                     </xsl:for-each>
                 </xsl:variable>
                 
-                <!-- read object from default_db.xml -->
                 
-                <xsl:variable name="merge_complexType" select="doc($default_db.xml)//complexType[@name=$NamespaceObjectInstanceTable]/sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+                
+                <!-- read object from default_db.xml -->
+                <xsl:if test="$targetNamespace.base='${targetNamespace.base}'"><xsl:message terminate="yes">#91 not set <xsl:value-of select="$targetNamespace.base"/></xsl:message></xsl:if>
+                <!--<xsl:variable name="merge_complexType" select="doc($default_db.xml)//complexType[@name=$NamespaceObjectInstanceTable]/sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>--><!-- TODO use system schema instead -->
+                <xsl:variable name="merge_complexType" select="root()//system_cache__appinfo:get_all_xsd_default_db/schema[ substring-after(@targetNamespace,'://')=substring-after($targetNamespace.base,'://')]/complexType[@name=$NamespaceObjectInstanceTable]/sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
                 <xsl:variable name="schema_merged">
-                    <xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_root">
+                    <xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_root" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
                         <xsl:with-param name="merge_complexType" select="$merge_complexType"/>
                     </xsl:apply-templates>
                 </xsl:variable>
-                <xsl:message>#93 default_db.xml object found <xsl:copy-of select="$default_db.xml"/></xsl:message>
-                
+                <xsl:variable name="system_cache__appinfo:new_object_by_prototype.base" select="root()//system_cache__appinfo:get_all_xsd_default_db/schema[ substring-after(@targetNamespace,'://')=substring-after($targetNamespace.base,'://')]/complexType[@name=$NamespaceObjectInstanceTable]/sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+                <xsl:message>#93 root()//name() <xsl:value-of select="root()/node()/name()" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>; $targetNamespace.base = <xsl:value-of select="$targetNamespace.base"/></xsl:message>
+                <xsl:message>#101 default_db.xml object found <xsl:copy-of select="$default_db.xml"/></xsl:message>
+                <xsl:message>#102 count(merge_complexType/*) <xsl:value-of select="count($merge_complexType/*)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+                <xsl:message>#104 count(system_cache__appinfo:new_object_by_prototype.base/*) <xsl:value-of select="count($system_cache__appinfo:new_object_by_prototype.base/*)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+                <xsl:message>#105 count(current/*) <xsl:value-of select="count(current()/*)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+                <xsl:message>#106 schema_merged <xsl:copy-of select="$schema_merged//*/@name" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message>
+                <xsl:if test="count($merge_complexType/*)=0"><xsl:message terminate="yes">#105 not found or error count($merge_complexType/* <xsl:value-of select="count($merge_complexType/*)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message></xsl:if>
+                <xsl:if test="count($system_cache__appinfo:new_object_by_prototype.base/*)=0"><xsl:message terminate="yes">#105 not found or error count(system_cache__appinfo:new_object_by_prototype.base/*) <xsl:value-of select="count($system_cache__appinfo:new_object_by_prototype.base/*)" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/></xsl:message></xsl:if>
                 <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_schema_root" select="$schema_merged" >
                     <xsl:with-param name="prototype_TargetNamespaceBindings_from_Namespace" select="$prototype_TargetNamespaceBindings_from_Namespace"/>
                     <xsl:with-param name="new_TargetNamespaceBindings_from_Namespace" select="$new_TargetNamespaceBindings_from_Namespace"/>
                     <xsl:with-param name="prototype_NamespacePrefix" select="$prototype_NamespacePrefix"/>
+                    <xsl:with-param name="system_cache__appinfo:new_object_by_prototype.base" select="$system_cache__appinfo:new_object_by_prototype.base"/>
                 </xsl:apply-templates>
+                
+                <!--<debug_90>
+                    <xsl:copy-of select="$schema_merged"></xsl:copy-of>
+                </debug_90>-->
+                
             </xsl:element>
         </xsl:result-document>
     </xsl:template>
@@ -109,6 +126,7 @@
     
     <xsl:template mode="system_cache__appinfo:object_modeling_new_add_xml_schema_root" match="complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="merge_complexType" required="yes"/>
+        <xsl:message>#120 matched complexType/<xsl:value-of select="@name"/></xsl:message>
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
             <xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_child">
@@ -118,17 +136,20 @@
     </xsl:template>
     
     <xsl:template mode="system_cache__appinfo:object_modeling_new_add_xml_schema_root" match="*" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:message>#130 matched */<xsl:value-of select="name()"/></xsl:message>
         <xsl:copy-of select="."/>
     </xsl:template>
     
     <xsl:template mode="system_cache__appinfo:object_modeling_new_add_xml_schema_child" match="sequence" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
         <xsl:param name="merge_complexType" required="yes"/>
+        <xsl:message>#136 matched sequence/@id <xsl:value-of select="@id"/></xsl:message>
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>
             <!--<xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_child">
                 <xsl:with-param name="merge_complexType" select="$merge_complexType/sequence"/>
             </xsl:apply-templates>-->
             <xsl:for-each select="element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+                <xsl:message>#143 testing element/@name<xsl:value-of select="@name"/></xsl:message>
                 <xsl:element name="{name()}">
                     <xsl:copy-of select="@*"/>
                     <xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_child_annotation"/>
@@ -136,12 +157,14 @@
             </xsl:for-each>
             <xsl:variable name="current" select="element"/>
             <xsl:for-each select="$merge_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+                <xsl:message>#152 from base trying element/<xsl:value-of select="@name"/></xsl:message>
                 <xsl:choose>
                     <xsl:when test="$current[@name = current()/@name]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
                         <xsl:message>#140 element <xsl:value-of select="@name"/> already exists!</xsl:message>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:element name="{name()}">
+                            <xsl:message>#159 adding <xsl:value-of select="@name"/></xsl:message>
                             <xsl:attribute name="name" select="@name"/>
                             <xsl:attribute name="type" select="$merge_complexType/ancestor::node()/simpleType[@name= substring-after(current()/@type,':')]/restriction/@base" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
                             <xsl:apply-templates mode="system_cache__appinfo:object_modeling_new_add_xml_schema_child_annotation"/>

+ 1 - 1
SE/schema/default_db_xml_cache.public/system_cache__appinfo/TargetNamespaceBindings.xsl

@@ -7,7 +7,7 @@
     
     <xsl:include href="../get_all_xsd.xsl"/>
     
-    <xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>
+    <!--<xsl:param name="targetNamespace_DEFAULTS_prefix" select="'default_db'"/>-->
     <xsl:param name="targetNamespace_DEFAULTS_prefix_objects" select="'default_objects'"/>
     <xsl:param name="TargetNamespaceBindingsApiUrl" select="'https://biuro.biall-net.pl/SE/version-git/wfs-data.php'"/>
      <!-- todo to override from config prefix etc -->

+ 1 - 1
SE/schema/default_db_xml_cache.public/system_cache__appinfo/external_schema_targetNamespace.xsl

@@ -89,7 +89,7 @@
     <xsl:function name="system_cache__appinfo:xpath.to.root_table">
         <xsl:param name="system_cache__appinfo:xpath"/> <!-- like p5_zasob_17666:sys_users/UserId -->
         <xsl:variable name="result" select=" substring-before($system_cache__appinfo:xpath,'/')"/>
-        <xsl:if test="string-length($result) &lt; 1"><xsl:message terminate="yes">#92 incorrect arg <xsl:value-of select="$system_cache__appinfo:xpath"/> should be like p5_zasob_17666:sys_users/UserId</xsl:message></xsl:if>
+        <xsl:if test="string-length($result) &lt; 1"><xsl:message terminate="yes">#92 incorrect arg=(<xsl:value-of select="$system_cache__appinfo:xpath"/>) should be like p5_zasob_17666:sys_users/UserId</xsl:message></xsl:if>
         <xsl:value-of select=" system_cache__appinfo:clean_object_prefix($result)"/>
     </xsl:function>
     

+ 29 - 0
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1172,6 +1172,35 @@ return $cmd;
 }
 
 
+function INSTALL_GETCOMMANDS_NODEJS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+
+//! NODEJS SERVER INSTALACJA
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v8.9.3.pkg','/tmp/node-v8.9.3.pkg');
+
+ $cmd[]['rsh']='installer -package "/tmp/stuff/node-v8.9.3.pkg" -target "/" -verbose';
+ 
+ $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/node-v6.3.1-darwin-x64.tar','/tmp/node-v6.3.1-darwin-x64.tar');
+ $cmd[]['rsh']='cd /tmp && tar xvfz node-v6.3.1-darwin-x64.tar';
+ $cmd[]['rsh']='mkdir -p /usr/local/nodejs';
+ $cmd[]['rsh']='mv /tmp/node-v6.3.1-darwin-x64/* /usr/local/nodejs';
+ $cmd[]['rsh']='cat /etc/paths | grep "/usr/local/nodejs" || echo "/usr/local/nodejs
+ " >> /etc/paths';
+ $cmd[]['rsh']='cat /etc/paths | grep "/usr/local/nodejs/bin" || echo "/usr/local/nodejs/bin
+ " >> /etc/paths';
+$cmd[]['rsh']='cat /etc/bashrc | grep "/usr/local/nodejs/bin" || echo "export PATH=\$PATH:/usr/local/nodejs/bin
+ " >> /etc/bashrc';
+$cmd[]['rsh']='npm install npm -g';
+$cmd[]['rsh']='npm install express';
+//further ! $cmd[]['rsh']='npm update express';
+
+
+
+return $cmd;
+}
+
+
+
+
 function INSTALL_GETCOMMANDS_WMS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 //! pakiet: INSTALL_GETCOMMANDS_WMS @2016-07 maintain bzyk
 

+ 4 - 1
SE/wfs-data.php

@@ -26,7 +26,10 @@ SEF('DEBUG_S');
 Lib::loadClass('ApiUser');
 Lib::loadClass('Api');
 
-if (!empty($_GET['sid'])) session_id($_GET['sid']); // TODO: security BUG
+if (!empty($_GET['sid'])) {
+	 session_id($_GET['sid']); // TODO: security BUG
+	 error_log('wfs-data.php _GET[sid] was read' .$_GET['sid'].' ; ');
+	 }
 session_start();
 session_write_close();