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

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="PRINT_TEMPLATE" default="xml_recursed_from_tr_map_with_RelatedFeatureLoop_html"
+<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>
         Etykieta
@@ -38,7 +38,10 @@
     <property name="default_db:recurse_ant_basedir" location="."/>
     <property name="default_db:recurse_ant_basedir.temp" location="${default_db:recurse_ant_basedir}/temp/${uuid}"/> <!-- /${uuid} -->
     <property name="default_db:recurse_ant" value="${default_db:recurse_ant_basedir}/build_recurse_ant.xml"/>
+    <property name="default_db:recurse_ant_basedir.recurse_cache" location="${default_db:recurse_ant_basedir}/recurse_cache"/>
      
+    <!--<property name="build_recurse_ant.childproperties" location="${WPS_Functions.childproperties}/build_recurse_ant.properties"/>--><!-- TODO UNKNOWN -->
+    
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
@@ -68,6 +71,7 @@
     <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"/>
     <!-- variables to first transform of doc for then get related features -->
@@ -95,6 +99,8 @@
     
     <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    <property name="input_obj_fid_forced" value="${input_obj_fid_forced}"/>
+    
     <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
     <!--<echo> $basedir=${basedir}; 
@@ -106,7 +112,16 @@
     <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"/><target name="uuid_cond">
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
+    
+    
+    <target name="write_child_props_to_config_dir" depends="install_folders">
+        <!--<echoproperties destfile="${build_recurse_ant.childproperties}"/>-->
+        <echo> TODO #120 - module is to be updated to provide properties - he dont know where is WPS_Functions - to fix. Bypassed properties</echo>
+    </target>
+    
+    
+    <target name="uuid_cond">
         <condition property="uuid_set" taskname="uuid_check">
             <or>
                 <equals arg1="${uuid}" arg2=""/>
@@ -226,8 +241,10 @@
     <target name="install_folders">
         <mkdir dir="${temp}"/>
         <mkdir dir="${out}"/>
+        <mkdir dir="${default_db:recurse_ant_basedir.recurse_cache}"/>
         <chmod  dir="${temp}" perm="ugo+rwx"/>
         <chmod  dir="${out}" perm="ugo+rwx"/>
+        <chmod  dir="${default_db:recurse_ant_basedir.recurse_cache}" perm="ugo+rwx"/>
     </target>
 
 
@@ -323,7 +340,7 @@
             <mkdir dir="${process_locks}"/>
         </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map,xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Pobierz XML obiektu">
                         
                         <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
                         <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
@@ -333,29 +350,45 @@
                         <!--<echoxml file="${out_task.dita.final}.xml">
                             <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
                         </echoxml>-->
-                    <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
-                    <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
-                            <factory name="net.sf.saxon.TransformerFactoryImpl">    
-                                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-                                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
-                            </factory>
-                            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
-                            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
-                            <param name="uuid" expression="${uuid_tested}"/>
-                            <!--<param name="basedir" expression="${basedir}"/>-->
-                            <param name="temp" expression="${temp}"/>
-                            <param name="with_RelatedFeatureLoop" expression="1"/>
-                            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-                        </xslt>
+                   
                         <echo message="OUTPUT__START"/>
                         <echo>
                             &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="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+        
+        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+        <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
+        
+        <!--<loadfile property="out_task.dita.final_no_RelatedFeatureRoot" srcfile="${out_task.dita.final}"/>-->
+        <!--<move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>-->
+        <!--<echoxml file="${out_task.dita.final}.xml">
+                            <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
+                        </echoxml>-->
+        <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="with_RelatedFeatureLoop" expression="1"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+       
+    </target>
+    
    
-    <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_noout" 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}"/>
@@ -374,8 +407,11 @@
         </exec>
         
         <echo message="OUTPUT__START"/>
-        <echo>
+        <!--<echo>
             &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
     </target>
@@ -422,7 +458,7 @@
     </target>
     
     <target name="check_set_default_db_xml_cache.public_local" depends="set_default_db_xml_cache.public_local" if="${set_default_db_xml_cache.public_local}">
-        <!--<echo> testujemy czy jest dita</echo>-->
+        <echo> #475 A Ustawiamy - testujemy czy jest dita</echo>
         <property name="default_db_xml_cache.public" value="default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -430,11 +466,13 @@
         <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"/>
+        <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </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>
+        <echo>#475 B Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
         <property name="default_db_xml_cache.public" value="${basedir}/../../../default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -442,12 +480,16 @@
         <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_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </target>
     
     
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-            <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?</echo>    
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -455,6 +497,7 @@
             <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 -->
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -473,6 +516,10 @@
         </xslt>-->
     </target>
    
+    <target name="clean" description="Clean all output and temp files">
+        <antcall target="clean_temp_dir"/>
+        <delete dir="${out}" failonerror="false"/>
+    </target>
    
     <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <!--<delete includeemptydirs="yes" failonerror="false">
@@ -556,6 +603,7 @@
             <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}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
     </target>
     
@@ -628,6 +676,11 @@
             <param name="parallel_pos" expression="${parallel_pos}"/>
             <param name="process_locks" expression="${process_locks}"/>
             <param name="get_wfs" expression="${get_wfs}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
+            <param name="build_recurse_ant_cache_control.xsl" expression="${build_recurse_ant_cache_control.xsl}"/>
+            <param name="typeNameRoot" expression="${typeName_tested}"/> <!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
+            <param name="input_obj_fid_forced" expression="${input_obj_fid_forced}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->
@@ -668,6 +721,7 @@
             <!--<param name="basedir" expression="${basedir}"/>-->
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
         </xslt>
         <echo> *************************************************************************
                * #573 FIHISHED NODE-LOOP in SAVED TO BE MERGED BY MERGE                     
@@ -782,7 +836,54 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </target>   
-     
+    
+    <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
+        
+        
+        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id}</echo>
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" > <!-- out_task.dita.final -->
+            <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="main"/>
+            </factory>
+            
+            <classpath location="/opt/local/share/java/saxon.jar"/>
+            <!--<classpath location="/opt/local/share/java/saxon9he.jar"/>-->
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <param name="username.pass" expression="${Password}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+        
+        
+        <!--<ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
+            <property name="uuid" value="${uuid}"/>
+            <property name="default_db:recurse_ant_basedir.out" value="${default_db:recurse_ant_basedir}/out"/>
+        </ant>-->
+        
+        <!--<exec executable="${dita.dir}" dir=".">
+            <arg value="-i"/>
+            <arg value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap" />
+            <!-\- <arg value="-t" />
+            <arg value="temp" />-\->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${out}"/>
+        </exec>-->
+        
+        <echo message="OUTPUT__START"/>
+        <!--<echo>
+            &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>
+        <echo message="OUTPUT__END"/>
+    </target>
     
     <target name="buildpdf_recursed_html5" 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 Wersję HTML">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>

+ 125 - 24
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/build_recurse_ant.xml

@@ -38,7 +38,10 @@
     <property name="default_db:recurse_ant_basedir" location="."/>
     <property name="default_db:recurse_ant_basedir.temp" location="${default_db:recurse_ant_basedir}/temp/${uuid}"/> <!-- /${uuid} -->
     <property name="default_db:recurse_ant" value="${default_db:recurse_ant_basedir}/build_recurse_ant.xml"/>
+    <property name="default_db:recurse_ant_basedir.recurse_cache" location="${default_db:recurse_ant_basedir}/recurse_cache"/>
      
+    <!--<property name="build_recurse_ant.childproperties" location="${WPS_Functions.childproperties}/build_recurse_ant.properties"/>--><!-- TODO UNKNOWN -->
+    
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
@@ -68,6 +71,7 @@
     <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"/>
     <!-- variables to first transform of doc for then get related features -->
@@ -95,6 +99,8 @@
     
     <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    <property name="input_obj_fid_forced" value="${input_obj_fid_forced}"/>
+    
     <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
     <!--<echo> $basedir=${basedir}; 
@@ -106,7 +112,16 @@
     <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"/><target name="uuid_cond">
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
+    
+    
+    <target name="write_child_props_to_config_dir" depends="install_folders">
+        <!--<echoproperties destfile="${build_recurse_ant.childproperties}"/>-->
+        <echo> TODO #120 - module is to be updated to provide properties - he dont know where is WPS_Functions - to fix. Bypassed properties</echo>
+    </target>
+    
+    
+    <target name="uuid_cond">
         <condition property="uuid_set" taskname="uuid_check">
             <or>
                 <equals arg1="${uuid}" arg2=""/>
@@ -226,8 +241,10 @@
     <target name="install_folders">
         <mkdir dir="${temp}"/>
         <mkdir dir="${out}"/>
+        <mkdir dir="${default_db:recurse_ant_basedir.recurse_cache}"/>
         <chmod  dir="${temp}" perm="ugo+rwx"/>
         <chmod  dir="${out}" perm="ugo+rwx"/>
+        <chmod  dir="${default_db:recurse_ant_basedir.recurse_cache}" perm="ugo+rwx"/>
     </target>
 
 
@@ -323,7 +340,7 @@
             <mkdir dir="${process_locks}"/>
         </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map,xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Pobierz XML obiektu">
                         
                         <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
                         <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
@@ -333,29 +350,45 @@
                         <!--<echoxml file="${out_task.dita.final}.xml">
                             <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
                         </echoxml>-->
-                    <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
-                    <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
-                            <factory name="net.sf.saxon.TransformerFactoryImpl">    
-                                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-                                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
-                            </factory>
-                            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
-                            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
-                            <param name="uuid" expression="${uuid_tested}"/>
-                            <!--<param name="basedir" expression="${basedir}"/>-->
-                            <param name="temp" expression="${temp}"/>
-                            <param name="with_RelatedFeatureLoop" expression="1"/>
-                            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-                        </xslt>
+                   
                         <echo message="OUTPUT__START"/>
                         <echo>
                             &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="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+        
+        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+        <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
+        
+        <!--<loadfile property="out_task.dita.final_no_RelatedFeatureRoot" srcfile="${out_task.dita.final}"/>-->
+        <!--<move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>-->
+        <!--<echoxml file="${out_task.dita.final}.xml">
+                            <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
+                        </echoxml>-->
+        <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="with_RelatedFeatureLoop" expression="1"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+       
+    </target>
+    
    
-    <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_noout" 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}"/>
@@ -374,8 +407,11 @@
         </exec>
         
         <echo message="OUTPUT__START"/>
-        <echo>
+        <!--<echo>
             &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
     </target>
@@ -422,7 +458,7 @@
     </target>
     
     <target name="check_set_default_db_xml_cache.public_local" depends="set_default_db_xml_cache.public_local" if="${set_default_db_xml_cache.public_local}">
-        <!--<echo> testujemy czy jest dita</echo>-->
+        <echo> #475 A Ustawiamy - testujemy czy jest dita</echo>
         <property name="default_db_xml_cache.public" value="default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -430,11 +466,13 @@
         <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"/>
+        <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </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>
+        <echo>#475 B Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
         <property name="default_db_xml_cache.public" value="${basedir}/../../../default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -442,12 +480,16 @@
         <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_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </target>
     
     
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-            <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?</echo>    
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -455,6 +497,7 @@
             <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 -->
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -473,6 +516,10 @@
         </xslt>-->
     </target>
    
+    <target name="clean" description="Clean all output and temp files">
+        <antcall target="clean_temp_dir"/>
+        <delete dir="${out}" failonerror="false"/>
+    </target>
    
     <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <!--<delete includeemptydirs="yes" failonerror="false">
@@ -556,6 +603,7 @@
             <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}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
     </target>
     
@@ -628,6 +676,11 @@
             <param name="parallel_pos" expression="${parallel_pos}"/>
             <param name="process_locks" expression="${process_locks}"/>
             <param name="get_wfs" expression="${get_wfs}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
+            <param name="build_recurse_ant_cache_control.xsl" expression="${build_recurse_ant_cache_control.xsl}"/>
+            <param name="typeNameRoot" expression="${typeName_tested}"/> <!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
+            <param name="input_obj_fid_forced" expression="${input_obj_fid_forced}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->
@@ -668,6 +721,7 @@
             <!--<param name="basedir" expression="${basedir}"/>-->
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
         </xslt>
         <echo> *************************************************************************
                * #573 FIHISHED NODE-LOOP in SAVED TO BE MERGED BY MERGE                     
@@ -782,7 +836,54 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </target>   
-     
+    
+    <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
+        
+        
+        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id}</echo>
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" > <!-- out_task.dita.final -->
+            <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="main"/>
+            </factory>
+            
+            <classpath location="/opt/local/share/java/saxon.jar"/>
+            <!--<classpath location="/opt/local/share/java/saxon9he.jar"/>-->
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <param name="username.pass" expression="${Password}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+        
+        
+        <!--<ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
+            <property name="uuid" value="${uuid}"/>
+            <property name="default_db:recurse_ant_basedir.out" value="${default_db:recurse_ant_basedir}/out"/>
+        </ant>-->
+        
+        <!--<exec executable="${dita.dir}" dir=".">
+            <arg value="-i"/>
+            <arg value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap" />
+            <!-\- <arg value="-t" />
+            <arg value="temp" />-\->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${out}"/>
+        </exec>-->
+        
+        <echo message="OUTPUT__START"/>
+        <!--<echo>
+            &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>
+        <echo message="OUTPUT__END"/>
+    </target>
     
     <target name="buildpdf_recursed_html5" 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 Wersję HTML">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>

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

@@ -458,7 +458,7 @@
     </target>
     
     <target name="check_set_default_db_xml_cache.public_local" depends="set_default_db_xml_cache.public_local" if="${set_default_db_xml_cache.public_local}">
-        <!--<echo> testujemy czy jest dita</echo>-->
+        <echo> #475 A Ustawiamy - testujemy czy jest dita</echo>
         <property name="default_db_xml_cache.public" value="default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -468,11 +468,11 @@
         <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
         <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
         <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
-        
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </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>
+        <echo>#475 B Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
         <property name="default_db_xml_cache.public" value="${basedir}/../../../default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -482,12 +482,14 @@
         <property name="recurse_ant_to_html.xsl" value="${default_db_xml_cache.public}/recurse_ant_to_html.xsl"/>
         <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
         <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </target>
     
     
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-            <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?</echo>    
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -495,6 +497,7 @@
             <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 -->
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -600,6 +603,7 @@
             <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}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
     </target>
     
@@ -676,6 +680,7 @@
             <param name="build_recurse_ant_cache_control.xsl" expression="${build_recurse_ant_cache_control.xsl}"/>
             <param name="typeNameRoot" expression="${typeName_tested}"/> <!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
             <param name="input_obj_fid_forced" expression="${input_obj_fid_forced}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+     <description>
         Umowa
     </description>
     <!-- template do kopiowania test-druk @2017-03-02 bindera 
@@ -38,7 +38,10 @@
     <property name="default_db:recurse_ant_basedir" location="."/>
     <property name="default_db:recurse_ant_basedir.temp" location="${default_db:recurse_ant_basedir}/temp/${uuid}"/> <!-- /${uuid} -->
     <property name="default_db:recurse_ant" value="${default_db:recurse_ant_basedir}/build_recurse_ant.xml"/>
+    <property name="default_db:recurse_ant_basedir.recurse_cache" location="${default_db:recurse_ant_basedir}/recurse_cache"/>
      
+    <!--<property name="build_recurse_ant.childproperties" location="${WPS_Functions.childproperties}/build_recurse_ant.properties"/>--><!-- TODO UNKNOWN -->
+    
     <property name="out" value="out"/> <!-- output ready files like pdf -->
     <property name="p5_tr_map_dir" location="${basedir}/../../../default_db.instance.xml/p5_tr_map" />
     <property name="simpleSchema_dir" location="${basedir}/../../../default_db.instance.xml/simpleSchema" />
@@ -68,6 +71,7 @@
     <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"/>
     <!-- variables to first transform of doc for then get related features -->
@@ -95,6 +99,8 @@
     
     <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
     
+    <property name="input_obj_fid_forced" value="${input_obj_fid_forced}"/>
+    
     <!--<echo>#93 $typeName= ${typeName};  $xpath= ${xpath};  $xpath_value= ${xpath_value}  </echo>-->
 
     <!--<echo> $basedir=${basedir}; 
@@ -106,7 +112,16 @@
     <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"/><target name="uuid_cond">
+    <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
+    
+    
+    <target name="write_child_props_to_config_dir" depends="install_folders">
+        <!--<echoproperties destfile="${build_recurse_ant.childproperties}"/>-->
+        <echo> TODO #120 - module is to be updated to provide properties - he dont know where is WPS_Functions - to fix. Bypassed properties</echo>
+    </target>
+    
+    
+    <target name="uuid_cond">
         <condition property="uuid_set" taskname="uuid_check">
             <or>
                 <equals arg1="${uuid}" arg2=""/>
@@ -226,8 +241,10 @@
     <target name="install_folders">
         <mkdir dir="${temp}"/>
         <mkdir dir="${out}"/>
+        <mkdir dir="${default_db:recurse_ant_basedir.recurse_cache}"/>
         <chmod  dir="${temp}" perm="ugo+rwx"/>
         <chmod  dir="${out}" perm="ugo+rwx"/>
+        <chmod  dir="${default_db:recurse_ant_basedir.recurse_cache}" perm="ugo+rwx"/>
     </target>
 
 
@@ -323,7 +340,7 @@
             <mkdir dir="${process_locks}"/>
         </target>
     
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map,xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" description="URL_TASK Pobierz XML obiektu">
                         
                         <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
                         <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
@@ -333,29 +350,45 @@
                         <!--<echoxml file="${out_task.dita.final}.xml">
                             <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
                         </echoxml>-->
-                    <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
-                    <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
-                            <factory name="net.sf.saxon.TransformerFactoryImpl">    
-                                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
-                                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
-                            </factory>
-                            <classpath location="/opt/local/share/java/saxon9he.jar"/>
-                            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
-                            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
-                            <param name="uuid" expression="${uuid_tested}"/>
-                            <!--<param name="basedir" expression="${basedir}"/>-->
-                            <param name="temp" expression="${temp}"/>
-                            <param name="with_RelatedFeatureLoop" expression="1"/>
-                            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
-                        </xslt>
+                   
                         <echo message="OUTPUT__START"/>
                         <echo>
                             &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="xml_recursed_from_tr_map_with_RelatedFeatureLoop_noout" depends="mkdir_process_locks,build_recurse_ant_xsl_xpath_filter.xsl,xml_recursed_from_tr_map" description="URL_TASK Pobierz XML obiektu">
+        
+        <!-- TODO proba wlaczenia rekursywnosci zapisanie wezla do sciezki w folderze-->
+        <!--<copy file="${out_task.dita.final}" tofile="${temp}/${loop_path_recurs}/${uuid_tested}.loop_path.xml" />-->
+        
+        <!--<loadfile property="out_task.dita.final_no_RelatedFeatureRoot" srcfile="${out_task.dita.final}"/>-->
+        <!--<move file="${out_task.dita.final}" tofile="${out_task.dita.final}.xml"/>-->
+        <!--<echoxml file="${out_task.dita.final}.xml">
+                            <RelatedFeatureRoot>${out_task.dita.final_no_RelatedFeatureRoot}</RelatedFeatureRoot>
+                        </echoxml>-->
+        <delete file="${out_task.dita.final_with_RelatedFeatureLoop}.xml"/>   
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${build_recurse_ant_merge_dita_from_temp.xsl}" in="${main_build_recurse_ant.dita_with_id}"  destdir="./" out="${out_task.dita.final_with_RelatedFeatureLoop}.xml" >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialMode" value="RelatedFeatureRoot"/>
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="with_RelatedFeatureLoop" expression="1"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+       
+    </target>
+    
    
-    <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_noout" 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}"/>
@@ -374,8 +407,11 @@
         </exec>
         
         <echo message="OUTPUT__START"/>
-        <echo>
+        <!--<echo>
             &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>
         <echo message="OUTPUT__END"/>
     </target>
@@ -422,7 +458,7 @@
     </target>
     
     <target name="check_set_default_db_xml_cache.public_local" depends="set_default_db_xml_cache.public_local" if="${set_default_db_xml_cache.public_local}">
-        <!--<echo> testujemy czy jest dita</echo>-->
+        <echo> #475 A Ustawiamy - testujemy czy jest dita</echo>
         <property name="default_db_xml_cache.public" value="default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -430,11 +466,13 @@
         <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"/>
+        <property name="build_recurse_ant_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </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>
+        <echo>#475 B Ustawiamy ${basedir}/../../../default_db_xml_cache.public</echo>
         <property name="default_db_xml_cache.public" value="${basedir}/../../../default_db_xml_cache.public"/>
         <property name="build_recurse_ant.xsl" value="${default_db_xml_cache.public}/build_recurse_ant.xsl"/>
         <property name="build_recurse_ant_merge_dita_from_temp.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_merge_dita_from_temp.xsl"/>
@@ -442,12 +480,16 @@
         <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_cache_control.xsl" value="${default_db_xml_cache.public}/build_recurse_ant_cache_control.xsl"/>
+        <property name="get_wfs_recurse_xsl.xsl" value="${default_db_xml_cache.public}/get_wfs_recurse_xsl.xsl"/>
+        <property name="external_schema_table.path" value="${default_db_xml_cache.public}/../external_schema_table"/>
     </target>
     
     
    
     <target name="main_build_recurse_ant.dita_with_id"  if="${test_if_dita}">
-            <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
+        <echo>#490 debug external_schema_table.path ${external_schema_table.path} - is it correct?</echo>    
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${main_build_recurse_ant.dita_with_id.xsl}" in="${main_build_recurse_ant.dita}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" >
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
             </factory>
@@ -455,6 +497,7 @@
             <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 -->
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
         </xslt>
     </target>
@@ -473,6 +516,10 @@
         </xslt>-->
     </target>
    
+    <target name="clean" description="Clean all output and temp files">
+        <antcall target="clean_temp_dir"/>
+        <delete dir="${out}" failonerror="false"/>
+    </target>
    
     <target name="clean_temp_dir" description="URL_TASK Wyczyść cache modułu ">
         <!--<delete includeemptydirs="yes" failonerror="false">
@@ -556,6 +603,7 @@
             <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}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
     </target>
     
@@ -628,6 +676,11 @@
             <param name="parallel_pos" expression="${parallel_pos}"/>
             <param name="process_locks" expression="${process_locks}"/>
             <param name="get_wfs" expression="${get_wfs}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
+            <param name="build_recurse_ant_cache_control.xsl" expression="${build_recurse_ant_cache_control.xsl}"/>
+            <param name="typeNameRoot" expression="${typeName_tested}"/> <!-- to cache purpose - to allow child elements cache created to be named from this typeNameRoot -->
+            <param name="input_obj_fid_forced" expression="${input_obj_fid_forced}"/>
+            <param name="external_schema_table.path" expression="${external_schema_table.path}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->
@@ -668,6 +721,7 @@
             <!--<param name="basedir" expression="${basedir}"/>-->
             <param name="temp" expression="${temp}"/>
             <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+            <param name="recurse_ant_basedir.recurse_cache" expression="${default_db:recurse_ant_basedir.recurse_cache}"/>
         </xslt>
         <echo> *************************************************************************
                * #573 FIHISHED NODE-LOOP in SAVED TO BE MERGED BY MERGE                     
@@ -782,7 +836,54 @@
         </echo>
         <echo message="OUTPUT__END"/>
     </target>   
-     
+    
+    <target name="buildpdf_recursed_xsl" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita"  description="retrieve and build object from api using just XSL calls - needed username and password">
+        
+        
+        <echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id}</echo>
+        <xslt basedir="${default_db:recurse_ant_basedir}" style="${get_wfs_recurse_xsl.xsl}" in="${empty.xml}"  destdir="./" out="${main_build_recurse_ant.dita_with_id}" > <!-- out_task.dita.final -->
+            <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="main"/>
+            </factory>
+            
+            <classpath location="/opt/local/share/java/saxon.jar"/>
+            <!--<classpath location="/opt/local/share/java/saxon9he.jar"/>-->
+            <!--<param name="webRootUrl" expression="${webRootUrl}" />--> 
+            <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
+            <param name="uuid" expression="${uuid_tested}"/>
+            <param name="username.pass" expression="${Password}"/>
+            <!--<param name="basedir" expression="${basedir}"/>-->
+            <param name="temp" expression="${temp}"/>
+            <param name="simpleSchema_dir" expression="${simpleSchema_dir}"/>
+        </xslt>
+        
+        
+        <!--<ant antfile="${build_CRM_PROCES_tree}" target="default_db:PROCES_INIT:tree:dita" inheritall="false">
+            <property name="uuid" value="${uuid}"/>
+            <property name="default_db:recurse_ant_basedir.out" value="${default_db:recurse_ant_basedir}/out"/>
+        </ant>-->
+        
+        <!--<exec executable="${dita.dir}" dir=".">
+            <arg value="-i"/>
+            <arg value="${CRM_PROCES_tree_basedir.temp}/${uuid}/${uuid}.ditamap" />
+            <!-\- <arg value="-t" />
+            <arg value="temp" />-\->
+            <arg value="-f" />
+            <arg value="pdf"/>
+            <arg value="-o"/>
+            <arg value="${out}"/>
+        </exec>-->
+        
+        <echo message="OUTPUT__START"/>
+        <!--<echo>
+            &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>
+            &lt;br&gt;# Wygenerowano wyjsciowy plik PDF - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${uuid}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${uuid}.pdf&lt;/a&gt;&lt;/br&gt; 
+        </echo>
+        <echo message="OUTPUT__END"/>
+    </target>
     
     <target name="buildpdf_recursed_html5" 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 Wersję HTML">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>