merge z xmlschema

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/build_recurse_ant.xml

@@ -62,12 +62,14 @@
     
     <property name="ignore_maxOccurs_0" value="1"/> <!-- When element has maxOccurs=0 do not try to retrieve him to limit tree -->
     
-    <property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="parallel_pos" value="1"/>
     <!--<property name="temp_name" value="temp" />--> <!-- temp files-->
-    <property name="parallel_pos" value="1"/><property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
+    <property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
     <property name="xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/${uuid}.xpath_query.xsl"/>
     <property name="build_recurse_ant_xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/build_recurse_ant_xpath_query.xsl"/>
-    <property name="process_locks" value="${default_db:recurse_ant_basedir.temp}/.locks"/><property name="empty.xml" value="${temp}/${uuid}.empty.xml"/>
+    <property name="process_locks" value="${default_db:recurse_ant_basedir.temp}/.locks"/>
+    <property name="empty.xml" value="${temp}/${uuid}.empty.xml"/>
     <!-- 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 -->
     
@@ -80,11 +82,20 @@
     <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${default_db:recurse_ant_basedir}/out/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
     
     <property name="ant-launcher.jar" location="/opt/local/share/java/apache-ant/lib/ant-launcher.jar"/><!-- should be also set in parent build -->
+    <property name="build_check_java_process_count.xml"  value="${basedir}/../check_java_process_count/build_check_java_process_count.xml"/>
+    <property name="parallel_java_process_max" value="20"/> <!-- to limit max processes in parallel concurent tasks jobs - will use ${build_check_java_process_count.xml} -->
      <!-- do zrobienia  -->
     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
+    <property name="get_wfs_basedir" location="${default_db:recurse_ant_basedir}/../../get_wfs"/>
+    <property name="get_wfs" location="${get_wfs_basedir}/build_get_wfs.xml"/>
     
-
+    <property name="build_CRM_PROCES_tree" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree/build_CRM_PROCES_tree.xml"/>
+    <property name="CRM_PROCES_tree_basedir" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree"  />                         
+    <property name="CRM_PROCES_tree_basedir.temp" location="${CRM_PROCES_tree_basedir}/temp"  />
+    
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
     <!--<echo> $basedir=${basedir}; 
         $temp=${temp};
@@ -92,14 +103,6 @@
     </echo>-->
 
     <!-- uuid -->
-    <property name="build_check_java_process_count.xml"  value="${basedir}/../check_java_process_count/build_check_java_process_count.xml"/>
-    <property name="parallel_java_process_max" value="20"/> <!-- to limit max processes in parallel concurent tasks jobs - will use ${build_check_java_process_count.xml} -->
-     <!-- do zrobienia  -->
-    <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
-    <property name="get_wfs_basedir" location="${default_db:recurse_ant_basedir}/../../get_wfs"/>
-    <property name="get_wfs" location="${get_wfs_basedir}/build_get_wfs.xml"/>
-    
-    <property name="build_CRM_PROCES_tree" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree/build_CRM_PROCES_tree.xml"/>
     <property name="CRM_PROCES_tree_basedir" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree"  />                         
     <property name="CRM_PROCES_tree_basedir.temp" location="${CRM_PROCES_tree_basedir}/temp"  />
     
@@ -315,6 +318,7 @@
                         <!--<echo message="OUTPUT__END"/>-->
                     </target>
     
+    
         <target name="mkdir_process_locks">
             <mkdir dir="${process_locks}"/>
         </target>
@@ -351,12 +355,7 @@
                         <echo message="OUTPUT__END"/>
          </target>
    
-    <!-- #### eof tr_map #### -->
-    
-    
-    <!-- ### php_session_id ### -->
-    
-        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
         
         <ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
             <property name="uuid" value="${uuid}"/>
@@ -379,7 +378,11 @@
             &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
-    </target><target name="php_session_id_cond">
+    </target>
+   
+   
+    
+        <target name="php_session_id_cond">
             <condition property="php_session_id_fail" taskname="php_session_id_check">
                 <or>
                     <equals arg1="${php_session_id}" arg2=""/>
@@ -425,8 +428,10 @@
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
         <property name="builds_to_ant.xsl" value="${default_db_xml_cache.public}/builds_to_ant.xsl"/>
         <property name="xpath_query_check_create_xsl.xsl" value="${default_db_xml_cache.public}/xpath_query_check_create_xsl.xsl"/>
-        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/><property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
-    <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/></target>
+        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+    </target>
     
     <target name="check_default_db_xml_cache.public_default" depends="set_default_db_xml_cache.public_local" unless="${set_default_db_xml_cache.public_local}">
         <echo> Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
@@ -435,7 +440,8 @@
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
         <property name="builds_to_ant.xsl" value="${default_db_xml_cache.public}/builds_to_ant.xsl"/>
         <property name="xpath_query_check_create_xsl.xsl" value="${default_db_xml_cache.public}/xpath_query_check_create_xsl.xsl"/>
-        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/><property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
     </target>
     
     
@@ -515,9 +521,18 @@
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="xpath_query" expression="[1=1]"/>
         </xslt>
+        <!--<copyfile src="${build_recurse_ant.xsl}" dest="${build_recurse_ant_xpath_query.xsl}"/>-->
+        <!--<xslt basedir="${default_db:recurse_ant_basedir}" style="${xpath_query_check_create_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${xpath_query.xsl}_secondary.xsl"  >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialTemplate" value="xpath_query_check_create_xsl"/> 
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="xpath_query" expression="[1=1]"/>
+        </xslt>-->
     </target>
     
-    <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
+    
     <target name="build_recurse_ant_xsl_xpath_filter.xsl_check" description="if it is set ">
         <condition taskname="build_recurse_ant_xsl_xpath_filter.xsl" property="xpath_query_set">
             <or>
@@ -555,11 +570,16 @@
             <param name="xpath_query" expression="${xpath_query}"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
         </xslt>
-    </target><target name="build_recurse_ant.xml" depends="php_session_id_check,xpath_query.xsl,xpath_query.xsl_fail,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
+    </target>
+    
+    <!-- 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,xpath_query.xsl,xpath_query.xsl_fail,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>
+        <!--<record name="ant.log" loglevel="verbose" append="true" />-->
+        <!--<delete file="${build_recurse_ant.xml}"/>-->
         <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_xpath_query.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -600,7 +620,7 @@
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
             <param name="ant-launcher.jar" expression="${ant-launcher.jar}"/>
-        <param name="build_check_java_process_count.xml" expression="${build_check_java_process_count.xml}"/>
+            <param name="build_check_java_process_count.xml" expression="${build_check_java_process_count.xml}"/>
             <param name="parallel_java_process_max" expression="${parallel_java_process_max}"/>
             <param name="debug_xsl_in_filename" expression="${main_build_recurse_ant.dita_with_id}"/>
             <param name="debug_xsl_out_filename" expression="${build_recurse_ant.xml}"/>
@@ -609,8 +629,12 @@
             <param name="process_locks" expression="${process_locks}"/>
             <param name="get_wfs" expression="${get_wfs}"/>
         </xslt>
-        <ant  antfile="${build_recurse_ant.xml}" dir="." ><property name="parallel_pos" value="${parallel_pos}"/>
+        <!--<import file="${build_recurse_ant.xml}"/>-->
+        <!--<record action="stop" name="ant.log"/>-->
+        <ant  antfile="${build_recurse_ant.xml}" dir="." >
+            <property name="parallel_pos" value="${parallel_pos}"/> <!-- To discrete parallel tasks in tempfiles creation errors etc -->
         </ant>
+
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
@@ -645,7 +669,12 @@
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
         </xslt>
-        <echo> zapisalem plik gotowy do utworzenia dita do ${out_task.dita.final}. </echo>
+        <echo> *************************************************************************
+               * #573 FIHISHED NODE-LOOP in SAVED TO BE MERGED BY MERGE                     
+               * $temp is ${temp}                                                      
+               * Saved to ${out_task.dita.final} . 
+               *************************************************************************    
+        </echo>
     </target>
     
     <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML obiektu">
@@ -715,6 +744,7 @@
 
 
     <target name="buildpdf_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,check_dita" if="${test_if_dita}">
+        
         <exec executable="${dita.dir}" dir=".">
             <arg value="-i"/>
             <arg value="${out_task.dita.final}" />

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xml

@@ -49,12 +49,10 @@
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
     <property name="php_session_id" value="${php_session_id}"/> <!-- optional cookie if sent work with it if not - get it -->
     <property name="url" value="${url}"/>
-    <!--<property name="url" value="${url}"/>-->
-    <!--<property name="url" value="${api_url}"/>-->
     <property name="webRootUrl" value="${$webRootUrl}"/>
 
-    
-    <property name="api_url" value="https://biuro.biall-net.pl/SE/version-git/wfs-data.php"/><property name="namespace_prefix" value="p5_default_db"/> <!-- ex: p5_default_db to complete after p5_default_db:IN7_DZIENNIK_KORESP -->
+    <property name="api_url" value="https://biuro.biall-net.pl/SE/version-git/wfs-data.php"/>
+    <property name="namespace_prefix" value="p5_default_db"/> <!-- ex: p5_default_db to complete after p5_default_db:IN7_DZIENNIK_KORESP -->
     <property name="namespace_prefix_p5_tr_map" value="default_db"/> <!-- do przetowrzenia w nazwie pliku docelowej element-default_db__x3A__CRM_PROCES__x3A__CRM_PROCES oraz dla detect_resource_type_dir -->
     <property name="typeName" value="${typeName}" /> <!-- to be set initially ex: p5_default_db:IN7_DZIENNIK_KORESP - be careful not to give it in apostrophs like 'p5_default_db:IN7_DZIENNIK_KORESP' - it wont work! -->
     <property name="xpath" value="${xpath}"/> <!-- to be set initially like as key to search ID  -->
@@ -64,9 +62,10 @@
     
     <property name="ignore_maxOccurs_0" value="1"/> <!-- When element has maxOccurs=0 do not try to retrieve him to limit tree -->
     
-    <property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="parallel_pos" value="1"/>
     <!--<property name="temp_name" value="temp" />--> <!-- temp files-->
-    <property name="parallel_pos" value="1"/><property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
+    <property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
     <property name="xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/${uuid}.xpath_query.xsl"/>
     <property name="build_recurse_ant_xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/build_recurse_ant_xpath_query.xsl"/>
     <property name="process_locks" value="${default_db:recurse_ant_basedir.temp}/.locks"/>
@@ -91,6 +90,10 @@
     <property name="get_wfs" location="${get_wfs_basedir}/build_get_wfs.xml"/>
     
     <property name="build_CRM_PROCES_tree" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree/build_CRM_PROCES_tree.xml"/>
+    <property name="CRM_PROCES_tree_basedir" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree"  />                         
+    <property name="CRM_PROCES_tree_basedir.temp" location="${CRM_PROCES_tree_basedir}/temp"  />
+    
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
     <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
@@ -352,12 +355,7 @@
                         <echo message="OUTPUT__END"/>
          </target>
    
-    <!-- #### eof tr_map #### -->
-    
-    
-    <!-- ### php_session_id ### -->
-    
-        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
         
         <ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
             <property name="uuid" value="${uuid}"/>
@@ -380,7 +378,11 @@
             &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
-    </target><target name="php_session_id_cond">
+    </target>
+   
+   
+    
+        <target name="php_session_id_cond">
             <condition property="php_session_id_fail" taskname="php_session_id_check">
                 <or>
                     <equals arg1="${php_session_id}" arg2=""/>
@@ -551,9 +553,10 @@
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="xpath_query" expression="[1=1]"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
-        <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
             <param name="typeName" expression="${typeName}"/>
-            <param name="namespace_prefix_p5_tr_map" expression="${namespace_prefix_p5_tr_map}"/></xslt>
+            <param name="namespace_prefix_p5_tr_map" expression="${namespace_prefix_p5_tr_map}"/>
+        </xslt>
     </target>
     
     <target name="build_recurse_ant_xsl_xpath_filter.xsl" depends="check_default_db_xml_cache.public_default,check_set_default_db_xml_cache.public_local,build_recurse_ant_xsl_xpath_filter.xsl_check" unless="${xpath_query_set}" description="Create build_recurse_ant_xsl_xpath_filter.xsl">
@@ -585,8 +588,8 @@
             
             <param name="build_recurse_ant.xsl" expression="${build_recurse_ant.xsl}"/>
             <param name="passwordBase64Basic" expression="${passwordBase64Basic_tested}"/>
-            <!--<param name="url" expression="${url}" />-->
-            <param name="url" expression="${url}" /><param name="webRootUrl" expression="${webRootUrl}" /> 
+            <param name="url" expression="${url}" />
+            <param name="webRootUrl" expression="${webRootUrl}" /> 
             <param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita_with_id}"/>
             <param name="uuid" expression="${uuid_tested}"/>
             
@@ -827,7 +830,6 @@
     
     <target name="buildpdf_recursed_tocjs" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}" description="URL_TASK Pobierz Dynamiczną Wersję HTML">
         <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=".">
             <arg value="-i"/>
             <arg value="${out_task.dita.final}" />

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/umowa/build_recurse_ant.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="PRINT_TEMPLATE" default="buildpdf_recursed"  >
+<project basedir="." name="recurse_ant" default="buildpdf_recursed"  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" >
     <description>
         Umowa
     </description>
@@ -61,12 +62,14 @@
     
     <property name="ignore_maxOccurs_0" value="1"/> <!-- When element has maxOccurs=0 do not try to retrieve him to limit tree -->
     
-    <property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="loop_path_recurs" 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/  -->
+    <!-- DO NOT SET --><property name="parallel_pos" value="1"/>
     <!--<property name="temp_name" value="temp" />--> <!-- temp files-->
-    <property name="parallel_pos" value="1"/><property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
+    <property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
     <property name="xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/${uuid}.xpath_query.xsl"/>
     <property name="build_recurse_ant_xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/build_recurse_ant_xpath_query.xsl"/>
-    <property name="process_locks" value="${default_db:recurse_ant_basedir.temp}/.locks"/><property name="empty.xml" value="${temp}/${uuid}.empty.xml"/>
+    <property name="process_locks" value="${default_db:recurse_ant_basedir.temp}/.locks"/>
+    <property name="empty.xml" value="${temp}/${uuid}.empty.xml"/>
     <!-- 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 -->
     
@@ -79,11 +82,20 @@
     <property name="out_task.dita.final_with_RelatedFeatureLoop"   value="${default_db:recurse_ant_basedir}/out/${uuid}.out_task.dita.final_with_RelatedFeatureLoop" />
     
     <property name="ant-launcher.jar" location="/opt/local/share/java/apache-ant/lib/ant-launcher.jar"/><!-- should be also set in parent build -->
+    <property name="build_check_java_process_count.xml"  value="${basedir}/../check_java_process_count/build_check_java_process_count.xml"/>
+    <property name="parallel_java_process_max" value="20"/> <!-- to limit max processes in parallel concurent tasks jobs - will use ${build_check_java_process_count.xml} -->
      <!-- do zrobienia  -->
     <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
+    <property name="get_wfs_basedir" location="${default_db:recurse_ant_basedir}/../../get_wfs"/>
+    <property name="get_wfs" location="${get_wfs_basedir}/build_get_wfs.xml"/>
     
-
+    <property name="build_CRM_PROCES_tree" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree/build_CRM_PROCES_tree.xml"/>
+    <property name="CRM_PROCES_tree_basedir" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree"  />                         
+    <property name="CRM_PROCES_tree_basedir.temp" location="${CRM_PROCES_tree_basedir}/temp"  />
+    
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
     <!--<echo> $basedir=${basedir}; 
         $temp=${temp};
@@ -91,14 +103,6 @@
     </echo>-->
 
     <!-- uuid -->
-    <property name="build_check_java_process_count.xml"  value="${basedir}/../check_java_process_count/build_check_java_process_count.xml"/>
-    <property name="parallel_java_process_max" value="20"/> <!-- to limit max processes in parallel concurent tasks jobs - will use ${build_check_java_process_count.xml} -->
-     <!-- do zrobienia  -->
-    <!--<tempfile property="wfs_output" deleteonexit="no"  destdir="temp"  suffix=".xml" />-->
-    <property name="get_wfs_basedir" location="${default_db:recurse_ant_basedir}/../../get_wfs"/>
-    <property name="get_wfs" location="${get_wfs_basedir}/build_get_wfs.xml"/>
-    
-    <property name="build_CRM_PROCES_tree" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree/build_CRM_PROCES_tree.xml"/>
     <property name="CRM_PROCES_tree_basedir" location="${default_db:recurse_ant_basedir}/../CRM_PROCES_tree"  />                         
     <property name="CRM_PROCES_tree_basedir.temp" location="${CRM_PROCES_tree_basedir}/temp"  />
     
@@ -314,6 +318,7 @@
                         <!--<echo message="OUTPUT__END"/>-->
                     </target>
     
+    
         <target name="mkdir_process_locks">
             <mkdir dir="${process_locks}"/>
         </target>
@@ -350,12 +355,7 @@
                         <echo message="OUTPUT__END"/>
          </target>
    
-    <!-- #### eof tr_map #### -->
-    
-    
-    <!-- ### php_session_id ### -->
-    
-        <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita" depends="xml_recursed_from_tr_map_with_RelatedFeatureLoop" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych">
         
         <ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
             <property name="uuid" value="${uuid}"/>
@@ -378,7 +378,11 @@
             &lt;br&gt;Wygenerowano wyjsciowy plik XML - sciagnij go &lt;a href=&quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
-    </target><target name="php_session_id_cond">
+    </target>
+   
+   
+    
+        <target name="php_session_id_cond">
             <condition property="php_session_id_fail" taskname="php_session_id_check">
                 <or>
                     <equals arg1="${php_session_id}" arg2=""/>
@@ -424,8 +428,10 @@
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
         <property name="builds_to_ant.xsl" value="${default_db_xml_cache.public}/builds_to_ant.xsl"/>
         <property name="xpath_query_check_create_xsl.xsl" value="${default_db_xml_cache.public}/xpath_query_check_create_xsl.xsl"/>
-        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/><property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
-    <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/></target>
+        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+    </target>
     
     <target name="check_default_db_xml_cache.public_default" depends="set_default_db_xml_cache.public_local" unless="${set_default_db_xml_cache.public_local}">
         <echo> Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
@@ -434,7 +440,8 @@
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
         <property name="builds_to_ant.xsl" value="${default_db_xml_cache.public}/builds_to_ant.xsl"/>
         <property name="xpath_query_check_create_xsl.xsl" value="${default_db_xml_cache.public}/xpath_query_check_create_xsl.xsl"/>
-        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/><property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
+        <property name="build_recurse_ant_xsl_xpath_filter.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_xsl_xpath_filter.xsl"/>
+        <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
     </target>
     
     
@@ -514,9 +521,18 @@
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
             <param name="xpath_query" expression="[1=1]"/>
         </xslt>
+        <!--<copyfile src="${build_recurse_ant.xsl}" dest="${build_recurse_ant_xpath_query.xsl}"/>-->
+        <!--<xslt basedir="${default_db:recurse_ant_basedir}" style="${xpath_query_check_create_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${xpath_query.xsl}_secondary.xsl"  >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialTemplate" value="xpath_query_check_create_xsl"/> 
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="xpath_query" expression="[1=1]"/>
+        </xslt>-->
     </target>
     
-    <!-- wygenerowanie ant builda do sciagniecia niezbednego elementu na podstawie template main.dita i tam zagniezdzonego RelatedFeature-->
+    
     <target name="build_recurse_ant_xsl_xpath_filter.xsl_check" description="if it is set ">
         <condition taskname="build_recurse_ant_xsl_xpath_filter.xsl" property="xpath_query_set">
             <or>
@@ -554,11 +570,16 @@
             <param name="xpath_query" expression="${xpath_query}"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
         </xslt>
-    </target><target name="build_recurse_ant.xml" depends="php_session_id_check,xpath_query.xsl,xpath_query.xsl_fail,main_build_recurse_ant.dita_with_id,main_build_recurse_ant.tr_map_with_id">
+    </target>
+    
+    <!-- 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,xpath_query.xsl,xpath_query.xsl_fail,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>
+        <!--<record name="ant.log" loglevel="verbose" append="true" />-->
+        <!--<delete file="${build_recurse_ant.xml}"/>-->
         <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_xpath_query.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${build_recurse_ant.xml}"  >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -599,7 +620,7 @@
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
             <param name="default_db_xml_cache.public" expression="${default_db_xml_cache.public}"/>
             <param name="ant-launcher.jar" expression="${ant-launcher.jar}"/>
-        <param name="build_check_java_process_count.xml" expression="${build_check_java_process_count.xml}"/>
+            <param name="build_check_java_process_count.xml" expression="${build_check_java_process_count.xml}"/>
             <param name="parallel_java_process_max" expression="${parallel_java_process_max}"/>
             <param name="debug_xsl_in_filename" expression="${main_build_recurse_ant.dita_with_id}"/>
             <param name="debug_xsl_out_filename" expression="${build_recurse_ant.xml}"/>
@@ -608,8 +629,12 @@
             <param name="process_locks" expression="${process_locks}"/>
             <param name="get_wfs" expression="${get_wfs}"/>
         </xslt>
-        <ant  antfile="${build_recurse_ant.xml}" dir="." ><property name="parallel_pos" value="${parallel_pos}"/>
+        <!--<import file="${build_recurse_ant.xml}"/>-->
+        <!--<record action="stop" name="ant.log"/>-->
+        <ant  antfile="${build_recurse_ant.xml}" dir="." >
+            <property name="parallel_pos" value="${parallel_pos}"/> <!-- To discrete parallel tasks in tempfiles creation errors etc -->
         </ant>
+
         <!-- pozbierac wszystkie do kupy xmle  -->
     </target>
     
@@ -644,7 +669,12 @@
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
         </xslt>
-        <echo> zapisalem plik gotowy do utworzenia dita do ${out_task.dita.final}. </echo>
+        <echo> *************************************************************************
+               * #573 FIHISHED NODE-LOOP in SAVED TO BE MERGED BY MERGE                     
+               * $temp is ${temp}                                                      
+               * Saved to ${out_task.dita.final} . 
+               *************************************************************************    
+        </echo>
     </target>
     
     <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html" depends="xml_recursed_from_tr_map" description="URL_TASK Pobierz HTML obiektu">
@@ -714,6 +744,7 @@
 
 
     <target name="buildpdf_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,check_dita" if="${test_if_dita}">
+        
         <exec executable="${dita.dir}" dir=".">
             <arg value="-i"/>
             <arg value="${out_task.dita.final}" />

SE/schema/default_db_xml_cache.public/appinfo.xsd

@@ -638,4 +638,19 @@ Ostatni wezel bedzie miec powtorzony ten numer w polu @change_optimize_id_root</
         </xs:complexType>
     </xs:element>
     <xs:element name="prefix" type="xs:NCName"/>
+    <xs:element name="base_type">
+        <xs:annotation>
+            <xs:documentation>used in root schema element to use in grouping anc classyfing objects in output styles templates</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute ref="system_cache__appinfo:base_type_group"/>
+            <xs:attribute ref="system_cache__appinfo:base_type_name"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attribute name="base_type_group" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>To handle some group in styles/output/object - e.g. Infrastructure</xs:documentation>
+        </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="base_type_name" type="xs:string"/>
 </xs:schema>

SE/schema/default_db_xml_cache.public/build_ant_universal_by_xsl_match.xsl

@@ -31,6 +31,115 @@
     <xsl:param name="ant-launcher.jar" 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">
+                    <xsl:if test="$properties.xml"><xsl:copy-of select="doc($properties.xml)/properties/*" copy-namespaces="no"/></xsl:if>
+                    <target name="{$antfile_prefix}">
+                        <parallel  failonany="true" threadCount="{$threadCount}"> <!-- threadCount="4"  -->
+                            <xsl:apply-templates mode="#current"/>
+                        </parallel>                        
+                    </target>
+                </project>
+    </xsl:template>
+    
+    <xsl:template mode="build_element_complexType.xml" match="build_cache">
+        <sequential>
+        <tempfile property="{with-param/@select}{with-param/@name}" deleteonexit="yes"><xsl:attribute name="destdir" select="'${detect_resource_type.local}'"/></tempfile>
+        <xslt basedir="./"    destdir="./"   out="${with-param/@select}{with-param/@name}">
+            <xsl:attribute name="style" select="'${build_complexType.xsl}'"/>
+            <xsl:attribute name="in" select="'${empty.xml}'"/>
+            <xsl:attribute name="out" select="concat('${',with-param/@select,with-param/@name,'}')"/>
+            <xsl:choose>
+                <xsl:when test="@name='build_element'">
+                    <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                        <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                        <attribute name="http://saxon.sf.net/feature/initialTemplate">
+                            <xsl:attribute name="value" select="'{http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd}build_element_cache'"/>
+                        </attribute>
+                    </factory>
+                    <param name="element" expression="{with-param/@select}"/>
+                </xsl:when>
+                <xsl:when test="@name='build_complexType'">
+                    <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                        <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                        <attribute name="http://saxon.sf.net/feature/initialTemplate">
+                            <xsl:attribute name="value" select="'{http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/appinfo.xsd}build_complexType_cache'"/>
+                        </attribute>
+                    </factory>
+                    <param name="complexType" expression="{with-param/@select}"/>
+                </xsl:when>
+                <xsl:otherwise><xsl:message terminate="yes">#72 unexpected type of element !</xsl:message></xsl:otherwise>
+            </xsl:choose>
+            <param name="default_db.instance.xml" >
+                <xsl:attribute name="expression" select="'${default_db.instance.xml}'"/>
+            </param>
+            <param name="default_db.instance.xml.symlink">
+                <xsl:attribute name="expression" select="'${default_db.instance.xml.symlink}'"/>
+            </param>
+            <param name="vrtfNamespaces_file" >
+                <xsl:attribute name="expression" select="'${vrtfNamespaces.xml}'"/>
+            </param>
+            <param name="procesy5_system_schema_file" >
+                <xsl:attribute name="expression" select="'${procesy5_system_schema.xml}'"/>
+            </param>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+        </xslt>
+            <delete>
+                <xsl:attribute name="file" select="concat('${',with-param/@select,with-param/@name,'}')"/>
+            </delete>
+        </sequential>
+    </xsl:template>
+    
+    <xsl:template mode="build_tr_map.xml" match="build_cache">
+        <sequential>
+            <tempfile property="{with-param/@select}{with-param/@name}" deleteonexit="yes"><xsl:attribute name="destdir" select="'${detect_resource_type.local}'"/></tempfile>
+            <xslt basedir="./"    destdir="./"   out="${with-param/@select}{with-param/@name}">
+                <xsl:attribute name="style" select="'${p5_tr_map.xsl}'"/>
+                <xsl:attribute name="in" select="'${empty.xml}'"/>
+                <xsl:attribute name="out" select="concat('${',with-param/@select,with-param/@name,'}')"/>
+                <xsl:choose>
+                    <xsl:when test="@name='build_element'">
+                        <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                            <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                            <attribute name="http://saxon.sf.net/feature/initialTemplate">
+                                <xsl:attribute name="value" select="'{http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd}go_recurse_from_root_by_build_element_cache'"/>
+                            </attribute>
+                        </factory>
+                        <param name="parent_type" expression="{with-param/@select}"/>
+                    </xsl:when>
+                    <xsl:when test="@name='build_complexType'">
+                        <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                            <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                            <attribute name="http://saxon.sf.net/feature/initialTemplate">
+                                <xsl:attribute name="value" select="'{http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache/procesy5_translate_map.xsd}go_recurse_from_root_by_build_complexType_cache'"/>
+                            </attribute>
+                        </factory>
+                        <param name="parent_type" expression="{with-param/@select}"/>
+                    </xsl:when>
+                    <xsl:otherwise><xsl:message terminate="yes">#72 unexpected type of element !</xsl:message></xsl:otherwise>
+                </xsl:choose>
+                <param name="default_db.instance.xml" >
+                    <xsl:attribute name="expression" select="'${default_db.instance.xml}'"/>
+                </param>
+                <param name="default_db.instance.xml.symlink">
+                    <xsl:attribute name="expression" select="'${default_db.instance.xml.symlink}'"/>
+                </param>
+                <param name="vrtfNamespaces_file" >
+                    <xsl:attribute name="expression" select="'${vrtfNamespaces.xml}'"/>
+                </param>
+                <param name="procesy5_system_schema_file" >
+                    <xsl:attribute name="expression" select="'${procesy5_system_schema.xml}'"/>
+                </param>
+                <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            </xslt>
+            <delete>
+                <xsl:attribute name="file" select="concat('${',with-param/@select,with-param/@name,'}')"/>
+            </delete>
+        </sequential>
+    </xsl:template>
+    
     <xsl:template match="*">
         <xsl:choose>
             <xsl:when test="name()=$match_root_element">

SE/schema/default_db_xml_cache.public/build_recurse_ant.xsl

@@ -79,7 +79,7 @@
     <xsl:param name="process_locks"/>
     <xsl:param name="get_wfs" required="yes"/>
     <xsl:param name="debug_xsl_out_filename" required="yes" />  
-    <xsl:param name="debug" select="5"/>
+    <xsl:param name="debug" select="1"/>
     <!--<xsl:variable name="temp_current">
         <xsl:choose>
             <xsl:when test="$temp='temp'">

SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -815,7 +815,7 @@
                                 <!--<xsl:with-param name="xpath_token" select="@xpath_token"/>--><!-- mozliwosc wybrania pierwszego wyrazu np 1 -->
                             </xsl:apply-templates>
                         </xsl:variable>
-                        111 <xsl:copy-of select="$enter_to_ph"/> 222
+                        <xsl:copy-of select="$enter_to_ph"/>
                     </xsl:when>
                     <xsl:otherwise><xsl:message terminate="yes">#810 unknown format <xsl:value-of select="../@format"/>; </xsl:message></xsl:otherwise>
                 </xsl:choose>
@@ -844,7 +844,7 @@
                                 <!--<xsl:with-param name="xpath_token" select="@xpath_token"/>--><!-- mozliwosc wybrania pierwszego wyrazu np 1 -->
                             </xsl:apply-templates>
                         </xsl:variable>
-                        AAA <xsl:copy-of select="$enter_to_ph"/> BBB
+                        <xsl:copy-of select="$enter_to_ph"/>
                     </xsl:when>
                     <xsl:otherwise><xsl:message terminate="yes">#810 unknown format <xsl:value-of select="../@format"/>; </xsl:message></xsl:otherwise>
                 </xsl:choose>

SE/schema/default_db_xml_cache.public/default_db/IN7_MK_BAZA_DYSTRYBUCJI/IN7_MK_BAZA_DYSTRYBUCJI_tree_to_dita.xsl

@@ -84,7 +84,7 @@
     </xsl:template>
     
     
-    <xsl:template match="INWESTYCJA_BUDOWA_SIECI|IN7_MK_BAZA_DYSTRYBUCJI" mode="preprocess_gml_geometry_image">
+    <xsl:template match="INWESTYCJA_BUDOWA_SIECI|IN7_MK_BAZA_DYSTRYBUCJI[ node()[contains(@system_cache__appinfo:type,'gml:')]//coordinates ]" mode="preprocess_gml_geometry_image">
         <!--<gml_to_image srcfile="{$temp}/{$uuid}/{ID}_{local-name()}.gml" dstfile="{$temp}/{$uuid}/{ID}_{local-name()}.png.xml" fileindex="{ID}_{local-name()}" ditadir="{$temp}/{$uuid}"/>-->
         <xsl:apply-templates mode="system_cache__appinfo:images__write" select="."/>
     </xsl:template>

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

@@ -49,7 +49,7 @@
     
     <xsl:template mode="system_cache__appinfo:images" match="image[@x and @y]">
         <xsl:param name="fileindex" required="yes"/>
-        <image href="{$fileindex}/image-{@x}-{@y}.png" width="300"/>
+        <image href="{$fileindex}/{$fileindex}_image-{@x}-{@y}.png" width="300"/>
     </xsl:template>
     
     <xsl:template mode="system_cache__appinfo:images" match="*">

SE/schema/default_db_xml_cache.public/main_build_recurse_ant.dita_with_id.xsl

@@ -424,7 +424,7 @@
         <xsl:attribute name="xpath" select="."/>
     </xsl:template>
     
-    <xsl:template match="@system_cache__appinfo:id|@system_cache__appinfo:maxOccurs|@system_cache__appinfo:minOccurs" mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs">
+    <xsl:template match="@system_cache__appinfo:id|@system_cache__appinfo:maxOccurs|@system_cache__appinfo:minOccurs|@system_cache__appinfo:base_type_group|@system_cache__appinfo:base_type_name" mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs">
         <xsl:copy-of select="."/>
     </xsl:template>
     <xsl:template match="@*" mode="p5_tr_map:go_recurse_from_root_by_build_element_477_attrs"/>
@@ -568,6 +568,18 @@
         </xsl:choose>
 
     </xsl:template>
+    
+    
+    <xsl:template match="appinfo" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" mode="detect_typeName_tr_map"/>
+    
+    <xsl:template match="appinfo" xpath-default-namespace="http://www.w3.org/2001/XMLSchema" >
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="system_cache__appinfo:base_type">
+        <xsl:copy-of select="." copy-namespaces="no"/>
+    </xsl:template>
+    
    
     <xsl:template mode="detect_typeName_tr_map" match="*">
         <xsl:variable name="NamespaceBinding" select="doc($NamespaceBinding.xml)/system_cache__appinfo:NamespaceBinding/system_cache__appinfo:binding[@targetNamespace=current()/@system_cache__appinfo:namespace_uri]"/>

SE/schema/default_db_xml_cache.public/object_modeling.xsl

@@ -180,6 +180,7 @@
         <xsl:element name="{name()}">
             <xsl:copy-of select="@*"/>         
             <xsl:copy-of select="text()"/>
+            <xsl:copy-of select="system_cache__appinfo:base_type"/>
             <xsl:apply-templates mode="system_cache__appinfo:new_object_by_prototype_schema_child"/>
         </xsl:element>
     </xsl:template>

SE/schema/default_db_xml_cache.public/system_cache__appinfo/postprocess.xsl

@@ -11,13 +11,16 @@
     <xsl:param name="uuid" required="yes"/>
     <xsl:param name="postprocess_modules.xml" required="yes"/>
     <xsl:param name="basedir" required="yes"/>
+    <xsl:param name="threadcount" select="'10'"/>
     
     <xsl:template mode="system_cache__appinfo:preprocess" match="preprocess_dita">
         <project basedir="{$temp}" name="project_for_{local-name()}" default="default">
             <property name="uuid" value="{$uuid}"/>
             <property name="temp" value="{$temp}"/>
             <target name="default">
-                <xsl:apply-templates mode="system_cache__appinfo:preprocess"/>
+                <parallel threadcount="{$threadcount}">
+                    <xsl:apply-templates mode="system_cache__appinfo:preprocess"/>
+                </parallel>
             </target>
         </project>
     </xsl:template>
@@ -27,7 +30,9 @@
             <property name="uuid" value="{$uuid}"/>
             <property name="temp" value="{$temp}"/>
             <target name="default">
-                <xsl:apply-templates mode="system_cache__appinfo:postprocess"/>
+                <parallel threadcount="{$threadcount}">
+                    <xsl:apply-templates mode="system_cache__appinfo:postprocess"/>
+                </parallel>
             </target>
         </project>
     </xsl:template>
@@ -51,11 +56,13 @@
     <xsl:template mode="system_cache__appinfo:preprocess" match="gml_to_image">
         <xsl:choose>
             <xsl:when test="@srcfile and @dstfile and @fileindex">
-                <echo>TODO convert gml 2 png for <xsl:value-of select="@srcfile"/> to <xsl:value-of select="@dstfile"/> , @fileindex=<xsl:value-of select="@fileindex"/>; - tymczasowy sposob mapowania do konfigu</echo>
+                
+                <echo> convert gml 2 png for <xsl:value-of select="@srcfile"/> to <xsl:value-of select="@dstfile"/> , @fileindex=<xsl:value-of select="@fileindex"/>; - tymczasowy sposob mapowania do konfigu</echo>
                 <xsl:variable name="current_node" select="."/>
                 <xsl:variable name="postprocess_modules" select="doc($postprocess_modules.xml)"/>
                 <xsl:for-each select="$postprocess_modules/postprocess_modules/node()[name()= current()/name()]">
                     <xsl:for-each select="*">
+                        <sequential>
                         <xsl:element name="{name()}">
                             <xsl:copy-of select="@*"/>
                             <property name="basedir" value="{$basedir}"/>
@@ -67,6 +74,7 @@
                                 </xsl:element>
                             </xsl:for-each>
                         </xsl:element>
+                        </sequential>
                     </xsl:for-each>
                 </xsl:for-each>
             </xsl:when>