Browse Source

tune - todo filtry w ogc i recurse w main_build_recurse_ant.dita_with_id.xsll; +build_recurse_ant.xsl

a.binder 9 years ago
parent
commit
7855834a0c

+ 5 - 0
SE/schema/ant-url_action/default_db.crm_proces/CRM_PROCES_tree/build.xml

@@ -35,6 +35,7 @@
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="../../../default_db.instance.xml/p5_tr_map" />
     <property name="detect_resource_type_dir" location="../../../default_db.instance.xml/detect_resource_type" />
+    <property name="build_complexType_dir" location="../../../default_db.instance.xml/build_complexType" />
     
     <property name="uuid" value="${uuid}"/> <!--TODO-->
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
@@ -340,6 +341,8 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -351,6 +354,8 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>

+ 12 - 9
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml

@@ -35,6 +35,7 @@
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="../../../default_db.instance.xml/p5_tr_map" />
     <property name="detect_resource_type_dir" location="../../../default_db.instance.xml/detect_resource_type" />
+    <property name="build_complexType_dir" location="../../../default_db.instance.xml/build_complexType" />
     
     <property name="uuid" value="${uuid}"/> <!--TODO-->
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
@@ -49,6 +50,8 @@
     <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
     <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
     
+    <property name="loop_path" value=""/>  <!-- w przypadku podania, system powinien w tym katalogu zapisywac wynik xml dzialania, azeby odbudowac rekursywne drzewo - zapisujemy po system_cache__appinfo:id np bedzie ${temp}/${uuid}_CRM_PROCES___d14e4479-1_PROCES_BEN/  -->
+    
     <!-- variables to first transform of doc for then get related features -->
     <!--<property name="default_db_xml_cache.public" value="../../../default_db_xml_cache.public"/>--> <!-- katalog z xsl z projektu src-xmlschema.git -->
     
@@ -257,6 +260,10 @@
                     
                     <target name="xml_recursed_from_tr_map" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_tr_map" description="Buduje wyjsciowego XMLa na podstawie mapy transportowej dla zastosowan w API DEVEL">
                         <echo message="OUTPUT__START"/>
+                        
+                        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+                        <copy file="${out_task.dita.final}" tofile="${temp}/${loop_path}/${uuid_tested}.loop_path.xml" />
+                        
                         <move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>
                         
                         <echo>
@@ -334,6 +341,8 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -345,13 +354,15 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
    
    
     <target name="clean_temp_dir" description="URL_TASK Target clean_temp_dir">
-        <delete>
+        <delete includeemptydirs="yes">
             <fileset dir="${temp}"/>
         </delete>        
         <echo message="OUTPUT__START"/>   
@@ -362,7 +373,6 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="php_session_id_check,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
-        
         <property name="loop_xpath"  value="root"/>
         <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml"/>
         <echo>#113 ant build_recurse_ant.xml=${build_recurse_ant.xml}; </echo>
@@ -402,9 +412,6 @@
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
-    
-    
-    
     <target name="build_recurse_ant_merge_dita_from_temp.xsl" depends="build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
         <xslt basedir="./" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
@@ -421,8 +428,6 @@
     </target>
 
 
-
-
     <target name="buildpdf_recursed" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
         <exec executable="${dita.dir}" dir=".">
@@ -464,7 +469,5 @@
     </target>
 
 
-
-    
     
 </project>

+ 12 - 9
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/build.xml

@@ -35,6 +35,7 @@
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="../../../default_db.instance.xml/p5_tr_map" />
     <property name="detect_resource_type_dir" location="../../../default_db.instance.xml/detect_resource_type" />
+    <property name="build_complexType_dir" location="../../../default_db.instance.xml/build_complexType" />
     
     <property name="uuid" value="${uuid}"/> <!--TODO-->
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
@@ -49,6 +50,8 @@
     <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
     <property name="xpath_value" value="${xpath_value}"/> <!-- to be set initially like 1000 (to search ID=1000, if ID we get by featureID  -->
     
+    <property name="loop_path" value=""/>  <!-- w przypadku podania, system powinien w tym katalogu zapisywac wynik xml dzialania, azeby odbudowac rekursywne drzewo - zapisujemy po system_cache__appinfo:id np bedzie ${temp}/${uuid}_CRM_PROCES___d14e4479-1_PROCES_BEN/  -->
+    
     <!-- variables to first transform of doc for then get related features -->
     <!--<property name="default_db_xml_cache.public" value="../../../default_db_xml_cache.public"/>--> <!-- katalog z xsl z projektu src-xmlschema.git -->
     
@@ -257,6 +260,10 @@
                     
                     <target name="xml_recursed_from_tr_map" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,check_tr_map" description="Buduje wyjsciowego XMLa na podstawie mapy transportowej dla zastosowan w API DEVEL">
                         <echo message="OUTPUT__START"/>
+                        
+                        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+                        <copy file="${out_task.dita.final}" tofile="${temp}/${loop_path}/${uuid_tested}.loop_path.xml" />
+                        
                         <move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>
                         
                         <echo>
@@ -334,6 +341,8 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -345,13 +354,15 @@
             </factory>
             <param name="namespace_prefix" expression="${namespace_prefix}"/>
             <param name="detect_resource_type_dir" expression="${detect_resource_type_dir}"/>
+            <param name="build_complexType_dir" expression="${build_complexType_dir}"/>
+            <param name="typeName" expression="${typeName_tested}"/> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
    
    
     <target name="clean_temp_dir" description="URL_TASK Target clean_temp_dir">
-        <delete>
+        <delete includeemptydirs="yes">
             <fileset dir="${temp}"/>
         </delete>        
         <echo message="OUTPUT__START"/>   
@@ -362,7 +373,6 @@
     <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
     <target name="build_recurse_ant.xml" depends="php_session_id_check,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
         <!-- build do wytworzenia pierwszego przetworzenia zagniezdzen -->
-        
         <property name="loop_xpath"  value="root"/>
         <property name="build_recurse_ant.xml" value="${temp}/${uuid_tested}.build_${loop_xpath}.xml"/>
         <echo>#113 ant build_recurse_ant.xml=${build_recurse_ant.xml}; </echo>
@@ -402,9 +412,6 @@
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
-    
-    
-    
     <target name="build_recurse_ant_merge_dita_from_temp.xsl" depends="build_recurse_ant.xml" description="z plikow temp/$uuid.* buduje $out_task.dita.final ">
         <xslt basedir="./" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
@@ -421,8 +428,6 @@
     </target>
 
 
-
-
     <target name="buildpdf_recursed" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
         <exec executable="${dita.dir}" dir=".">
@@ -464,7 +469,5 @@
     </target>
 
 
-
-    
     
 </project>

+ 208 - 12
SE/schema/default_db_xml_cache.public/main_build_recurse_ant.dita_with_id.xsl

@@ -7,6 +7,7 @@
     xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"
     xmlns:default_db="http://biuro.biall-net.pl/xmlschema_procesy5/default_db"
     xmlns:p5_default_db="https://biuro.biall-net.pl/wfs/default_db"
+    xmlns:ogc="http://www.opengis.net/ogc"
     
     exclude-result-prefixes="xs"
     version="2.0">
@@ -16,6 +17,8 @@
     
     <xsl:param name="namespace_prefix"  required="yes"/>
     <xsl:param name="detect_resource_type_dir" required="yes"/><!-- do okreslania dziedziczen i weryfikacji ich i uproszczenia poczatkowego dla pracy na bazowych obiektach -->
+    <xsl:param name="build_complexType_dir" required="yes"/><!-- do okreslenia filtrow wymaganych typow na bazie simpletype -->
+    <!--<xsl:param name="typeName" required="yes"/> - nie dziala to przekazanie tedy - trzeba czekac na _434 --> <!-- do przekazania glownego elementu do wykrycia glownie buildComplexType dla filtrow, w kolejnych zaglebieniach jada po @ref -->
     <xsl:output indent="yes" />
     <xsl:strip-space elements="*"/>
     
@@ -47,11 +50,15 @@
     <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element">
         <!--<xsl:variable name="detect_resource_type" select=" system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type_from_cache(@system_cache__appinfo:ref)"/>-->
         <RelatedFeature>
-            <xsl:attribute name="xpath" select="@flat_relation_cache_name"/>
-            <xsl:attribute name="typeName" select="@flat_relation_cache_xpath"/>
+            <!--<xsl:attribute name="xpath" select="@flat_relation_cache_name"/>-->
+            <!--<xsl:attribute name="typeName" select="@flat_relation_cache_xpath"/>-->
                 <!-- wykrycie pierwszego @local-name-name -->
-                <xsl:attribute name="xpath" select="'ID'"/>
+                <xsl:attribute name="xpath" select="'ID'"/><!-- to do upgrade - nie powinno sie szukac domyslnie po ID -->
                 <xsl:apply-templates mode="detect_typeName_tr_map"/>
+                <!-- spokojnie po 434 mozna wykryc @parent_type = default_db__x3A__CRM_PROCES:PROCES - powinno byc childem - jak nie to todo! -->
+            <xsl:variable name="build_complexType" select="doc(concat($build_complexType_dir,'/element-',system_cache__appinfo:escape_object_prefix_to_string(p5_tr_map:go_recurse_from_root_by_build_element_434/@parent_type),'.xml'))"/>
+            
+            
                 <xsl:choose>
                     <xsl:when test="1=2"/>
                     <!--<xsl:when test="@system_cache__appinfo:id">
@@ -61,19 +68,57 @@
                         <xsl:attribute name="xml_id" select="generate-id()"/>
                     </xsl:otherwise>
                 </xsl:choose>
-            <xsl:apply-templates/>
+            <xsl:call-template name="p5_tr_map:simpleTypeMakeOgcFilter">
+                <xsl:with-param name="build_complexType" select="$build_complexType"/>
+            </xsl:call-template>
+            <xsl:apply-templates>
+                <xsl:with-param name="build_complexType" select="$build_complexType"/>
+            </xsl:apply-templates>
         </RelatedFeature>
     </xsl:template>
     
-    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_434|p5_tr_map:go_recurse_from_root_by_build_element_434c">
-        <xsl:apply-templates/>
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_434"><!-- tu wykrywamy nazwe elementu z @parent_type = default_db__x3A__CRM_PROCES:CRM_PROCES -->
+        <xsl:param name="build_complexType" required="yes"/>
+        <!--<xsl:variable name="build_complexType" select="doc(concat($build_complexType_dir,'/element-',system_cache__appinfo:escape_object_prefix_to_string(@parent_type),'.xml'))"/>-->
+        <xsl:message>#72 434 for <xsl:value-of select="@parent_type"/>; opening=<xsl:value-of select="concat($build_complexType_dir,'/element-',system_cache__appinfo:escape_object_prefix_to_string(@parent_type),'.xml')"/>; </xsl:message>
+        <xsl:apply-templates>
+            <xsl:with-param name="build_complexType" select="$build_complexType"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_434c">
+        <xsl:param name="build_complexType" required="yes"/><!-- to jest instancja po refie 477 - powinno to zapalic wlasciwe build_complexType-->
+        <xsl:message>#80 434c for <xsl:value-of select="@parent_type"/>;</xsl:message>
+        <xsl:apply-templates>
+            <xsl:with-param name="build_complexType" select="$build_complexType"/>
+        </xsl:apply-templates>
     </xsl:template>
     
     <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_473"><!-- sekwencje -->
-        <xsl:apply-templates/>
+        <xsl:param name="build_complexType" required="yes"/>
+        <xsl:apply-templates>
+            <xsl:with-param name="build_complexType" select="$build_complexType"/>
+        </xsl:apply-templates>
     </xsl:template>
     
-    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_477">
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_4942"><!-- dziedziczenia dodatkowe -->
+        <xsl:param name="build_complexType" required="yes"/>
+        <xsl:apply-templates>
+            <xsl:with-param name="build_complexType" select="$build_complexType"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_481|p5_tr_map:go_recurse_from_root_by_build_element_4812|p5_tr_map:go_recurse_from_root_by_build_element_4810|p5_tr_map:go_recurse_from_root_by_build_element_4811"><!-- dziedziczenia za refem i 434c -->
+        <xsl:param name="build_complexType" required="yes"/>
+        <xsl:apply-templates>
+            <xsl:with-param name="build_complexType" select="$build_complexType"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_477[not(@system_cache__appinfo:loop_name)]">
+        <!--<xsl:param name="build_complexType" required="yes"/>< - tutaj tworzymy kolejne lokalne build_complexType-->
+        <xsl:variable name="build_complexType" select="doc(concat($build_complexType_dir,'/element-',system_cache__appinfo:escape_object_prefix_to_string(@system_cache__appinfo:ref),'.xml'))"/>
         <xsl:variable name="detect_resource_type" select=" system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type_from_cache(@system_cache__appinfo:ref)"/>
         <RelatedFeature>
             <xsl:attribute name="xml_id" select="generate-id()"/>
@@ -101,14 +146,60 @@
                  <!--<prefixed_object_info>
                      <xsl:copy-of select="$detect_resource_type"/>
                  </prefixed_object_info>-->
+                <xsl:call-template name="p5_tr_map:simpleTypeMakeOgcFilter">
+                    <xsl:with-param name="build_complexType" select="$build_complexType"/>
+                </xsl:call-template>
                 <xsl:element name="{concat($namespace_prefix,':',$detect_resource_type//system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/@system_cache__appinfo:get_default_db_obj_url_table_name)}">
                     <xsl:attribute name="xml_id" select="generate-id()"/>
                     <xsl:apply-templates mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs" select="@*"/>
-                    <xsl:apply-templates/>
+                    <xsl:apply-templates>
+                        <xsl:with-param name="build_complexType" select="$build_complexType"/>
+                    </xsl:apply-templates>
                 </xsl:element>
         </RelatedFeature>
     </xsl:template>
     
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_477[@system_cache__appinfo:loop_name]">
+        <!--<xsl:param name="build_complexType" required="yes"/>-->
+        <xsl:variable name="build_complexType" select="doc(concat($build_complexType_dir,'/element-',system_cache__appinfo:escape_object_prefix_to_string(@system_cache__appinfo:ref),'.xml'))"/><!-- tutaj na podstawie tego powinnismy zbudowac odpowiedni filtr lub olac? o to zadba kolejne wyzwolenie rekursywne-->
+        <xsl:variable name="detect_resource_type" select=" system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type_from_cache(@system_cache__appinfo:ref)"/> 
+        <RelatedFeatureLoop>
+            <xsl:attribute name="xml_id" select="generate-id()"/>
+            <!-- tymczasowe wymuszenie relacji do obiektu glownego na podstawie $detect_resource_type -->
+            <!--<xsl:attribute name="typeName" select="p5_tr_map:force_local_typeName(@system_cache__appinfo:ref)"/>-->
+            <xsl:attribute name="typeName" select="concat($namespace_prefix,':',$detect_resource_type//system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/@system_cache__appinfo:get_default_db_obj_url_table_name)" />
+            <!--<xsl:attribute name="xpath" select="@flat_relation_cache_name"/>-->
+            <!-- wykrycie pierwszego @local-name-name -->
+            <xsl:attribute name="flat_relation_cache_xpath" select="@flat_relation_cache_xpath"/>
+            <xsl:attribute name="flat_relation_cache_name" select="@flat_relation_cache_name"/>            
+            <xsl:attribute name="system_cache__appinfo:get_default_db_obj_url_table_name" select="$detect_resource_type//system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/@system_cache__appinfo:get_default_db_obj_url_table_name"/>
+            <xsl:choose>
+                <xsl:when test="@system_cache__appinfo:maxOccurs='0' and @system_cache__appinfo:minOccurs='0'">
+                    <xsl:message>#90 node=<xsl:value-of select="@system_cache__appinfo:ref"/>; to BYPASS! TODO @system_cache__appinfo:maxOccurs=0 and @system_cache__appinfo:minOccurs  </xsl:message>
+                </xsl:when>
+            </xsl:choose> 
+            <xsl:apply-templates mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs" select="@*"/>
+            <xsl:attribute name="xml_id" select="generate-id()"/>
+            <xsl:message>#125 try to name element <xsl:value-of select="concat($namespace_prefix,':',$detect_resource_type//system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/@system_cache__appinfo:get_default_db_obj_url_table_name)"/>; </xsl:message>
+            <xsl:apply-templates mode="p5_tr_map:go_recurse_from_root_by_build_element_477_backref" select="."/>
+            <!--<xsl:comment> #73 to check instances tables:
+                     <xsl:copy-of select="$detect_resource_type/system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_objects_parent_relations/
+                         system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/p5_tr_map:objects_derivations_list"/>
+                 </xsl:comment>-->
+            <!--<prefixed_object_info>
+                     <xsl:copy-of select="$detect_resource_type"/>
+                 </prefixed_object_info>-->
+            <xsl:call-template name="p5_tr_map:simpleTypeMakeOgcFilter">
+                <xsl:with-param name="build_complexType" select="$build_complexType"/>
+            </xsl:call-template>
+            <xsl:element name="{concat($namespace_prefix,':',$detect_resource_type//system_cache__resources_tree_generate_xsl_required_occurs_raport:detect_resource_type/@system_cache__appinfo:get_default_db_obj_url_table_name)}">
+                <xsl:attribute name="xml_id" select="generate-id()"/>
+                <xsl:apply-templates mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs" select="@*"/>
+                <!--<xsl:apply-templates/>-->
+            </xsl:element>
+        </RelatedFeatureLoop>
+    </xsl:template>
+    
     <xsl:template mode="p5_tr_map:go_recurse_from_root_by_build_element_477_backref" match="*">
         <!-- podmieniamy na relacje od drugiej strony-->
         <xsl:choose>
@@ -128,15 +219,17 @@
        
     </xsl:template>
     
-    
-    <xsl:template match="*">
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_428"> <!-- przetworzenie z dedykowanym filtrem na bazie build_complexType -->
+        <xsl:param name="build_complexType" required="yes"/> <!-- trzeba przekazac jaki element root jest tworzony dla wlasciwego sciagniecia definicji filtru simpleType -->
         <xsl:variable name="element-name">
             <xsl:choose>
                 <xsl:when test="@local-name-name"><xsl:value-of select="@local-name-name"/></xsl:when>
                 <xsl:otherwise><xsl:value-of select="name()"/></xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
-        <xsl:message>#125 try to name element <xsl:value-of select="$element-name"/>; </xsl:message>
+        <!--<xsl:variable name="simpleType" select="doc(concat( $build_complexType_dir,'/',p5_tr_map:force_local_typeName($)))"/>-->
+        
+        <xsl:message>#175 try to name element <xsl:value-of select="$element-name"/>; </xsl:message>
         <xsl:element name="{$element-name}">
             <xsl:apply-templates select="@*">
                 <xsl:with-param name="element" select="name()"/>
@@ -157,6 +250,53 @@
         </xsl:element>
     </xsl:template>
     
+    <xsl:template match="*">
+        <xsl:variable name="element-name">
+            <xsl:value-of select="name()"/>
+        </xsl:variable>
+        <xsl:message>#225 try to name element <xsl:value-of select="$element-name"/>; @event_type = <xsl:value-of select="@event_type"/>; </xsl:message>
+        <xsl:element name="{$element-name}">
+            <xsl:apply-templates select="@*">
+                <xsl:with-param name="element" select="name()"/>
+                <xsl:with-param name="node" select="."/>
+            </xsl:apply-templates>
+            <xsl:attribute name="xml_id" select="generate-id()"/>
+            <xsl:apply-templates/>
+        </xsl:element>
+    </xsl:template>
+    
+    
+    <xsl:template match="p5_tr_map:go_recurse_from_root_by_build_element_494|p5_tr_map:go_recurse_from_root_by_build_element_4940">
+        <xsl:param name="build_complexType" required="yes"/>
+        <!--<xsl:variable name="element-name">
+            <xsl:choose>
+                <xsl:when test="@local-name-name"><xsl:value-of select="@local-name-name"/></xsl:when>
+                <xsl:otherwise><xsl:value-of select="name()"/></xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>-->
+        <xsl:message>#125 try to name element <xsl:value-of select="$build_complexType/element/@name" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>; @event_type = <xsl:value-of select="@event_type"/>; </xsl:message>
+        <xsl:element name="{$build_complexType/element/@name}" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+            <xsl:apply-templates select="@*">
+                <xsl:with-param name="element" select="name()"/>
+                <xsl:with-param name="node" select="."/>
+            </xsl:apply-templates>
+            <!--<xsl:copy-of select="@*"/>-->
+            <xsl:choose>
+                <!-- <xsl:when test="@system_cache__appinfo:id">
+                    <xsl:attribute name="xml_id" select="@system_cache__appinfo:id"/>
+                </xsl:when>-->
+                <xsl:when test="1=2"/>
+                <xsl:otherwise>
+                    <xsl:attribute name="xml_id" select="generate-id()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <!--<xsl:attribute name="xml_id" select="generate-id()"/>-->
+            <xsl:apply-templates>
+                <xsl:with-param name="build_complexType" select="$build_complexType"/>
+            </xsl:apply-templates>
+        </xsl:element>
+    </xsl:template>
+    
     <xsl:template match="@local-name-name">
         <xsl:attribute name="xpath" select="."/>
     </xsl:template>
@@ -167,6 +307,62 @@
     <xsl:template match="@*" mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs"/>
         
     
+    <xsl:template name="p5_tr_map:simpleTypeMakeOgcFilter">
+        <xsl:param name="build_complexType" required="yes"/>
+        <!--<xsl:param name="system_cache__appinfo:id" required="yes"/>-->
+        <simpleTypeMakeOgcFilter>
+            <xsl:attribute name="name" select="$build_complexType/element/@name" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter" select="$build_complexType/element" xpath-default-namespace="http://www.w3.org/2001/XMLSchema"/>
+        </simpleTypeMakeOgcFilter>
+    </xsl:template>
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="sequence|complexType" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:element name="{name()}">
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter"/>
+        </xsl:element>
+    </xsl:template>
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="element[not(@ref)]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <!--<xsl:element name="{name()}">
+            <xsl:attribute name="name" select="@name"/>-->
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter">
+                <xsl:with-param name="name" select="@name"/>
+            </xsl:apply-templates>
+        <!--</xsl:element>-->
+    </xsl:template>
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="simpleType[not(@system_cache__appinfo:namespace_uri='http://www.w3.org/2001/XMLSchema')]" xpath-default-namespace="http://www.w3.org/2001/XMLSchema">
+        <xsl:param name="name" required="yes"/>
+        <!--<xsl:element name="{name()}">
+            <xsl:attribute name="id" select="@id"/>
+            <xsl:attribute name="system_cache__appinfo:namespace_uri" select="@system_cache__appinfo:namespace_uri"/>-->
+            <xsl:apply-templates mode="p5_tr_map:simpleTypeMakeOgcFilter">
+                <xsl:with-param name="name" select="$name"/>
+            </xsl:apply-templates>
+        <!--</xsl:element>-->
+    </xsl:template>
+    
+    <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:template>
+    
+    <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:PropertyIsEqualTo>
+                <ogc:PropertyName><xsl:value-of select="$name"/></ogc:PropertyName>
+                <ogc:Literal><xsl:value-of select="@value"/></ogc:Literal>
+            </ogc:PropertyIsEqualTo>
+        </ogc:Or>
+    </xsl:template>
+    
+    
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter" match="*|text()|@*|comment()"/>
+    <xsl:template mode="p5_tr_map:simpleTypeMakeOgcFilter_restriction" match="*|text()|@*|comment()"/>
     
     <xsl:template match="@*">
         <xsl:param name="element"/>