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

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/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>
         Druk domyslny dla danego typu
     </description>
     <!-- template do kopiowania test-druk @2017-03-02 bindera 
@@ -38,7 +38,9 @@
     <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="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 +70,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 +98,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 +111,9 @@
     <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="uuid_cond">
         <condition property="uuid_set" taskname="uuid_check">
             <or>
                 <equals arg1="${uuid}" arg2=""/>
@@ -226,8 +233,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 +332,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 +342,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 +399,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 XML - 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>
@@ -430,7 +458,8 @@
         <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"/>
+        
     </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}">
@@ -442,6 +471,7 @@
         <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"/>
     </target>
     
     
@@ -628,6 +658,10 @@
             <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}"/>
         </xslt>
         <!--<import file="${build_recurse_ant.xml}"/>-->
         <!--<record action="stop" name="ant.log"/>-->
@@ -668,6 +702,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