merged

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

@@ -448,6 +448,7 @@
         <echo>#427 $out_task.dita.final = ${out_task.dita.final} , $out = ${out} , $out_task_file =  ${out_task_file}
             $out_task.dita.final.noext = ${out_task.dita.final.noext}
             $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
+            $CRM_PROCES_tree_basedir.temp = ${CRM_PROCES_tree_basedir.temp}
         </echo>
         <!-- 
                  [echo] #427 $out_task.dita.final = /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/temp/Proj6782__/Proj6782___out_task_dita_final.dita , 

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

@@ -5,7 +5,8 @@
         Pismo
     </description>
     
-    <!--<echo>#88 $uuid = ${uuid}</echo>--><!-- template do kopiowania test-druk @2017-03-02 bindera 
+    <!--<echo>#88 $uuid = ${uuid}</echo>-->
+    <!-- template do kopiowania test-druk @2017-03-02 bindera 
     Copyright BIALL-NET sp. z o.o. wszelkie prawa zastrzezone
     
     -->
@@ -35,7 +36,8 @@
         -DtypeName="p5_default_db:IN7_DZIENNIK_KORESP" 
         -Dxpath=ID -Dxpath_value=1000 
         -Duuid=1 -DwebRootUrl=somePathDir-->
-            <include file="build.recurse_ant.PRODUCT.xml"/>
+    
+    <include file="build.recurse_ant.PRODUCT.xml"/>
     <include file="${basedir}/../build_SE.xml" as="p5build_SE"/><!-- for paths and dirs create in some tasks -->
     <!--<include file="${p5build_SE.build}" as="p5build_SE"/> <!-\- for paths and dirs create in some tasks -\->-->
     <include file="${send_email.build.xml}" as="send_email"/>
@@ -435,7 +437,7 @@
     </target>
    
    
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" unless="confirmAntfile.isset" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
         <record name="recursed.log" action="start" />
         
         <exec  executable="bash" dir="." outputproperty="out_task_file">
@@ -446,6 +448,7 @@
         <echo>#427 $out_task.dita.final = ${out_task.dita.final} , $out = ${out} , $out_task_file =  ${out_task_file}
             $out_task.dita.final.noext = ${out_task.dita.final.noext}
             $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
+            $CRM_PROCES_tree_basedir.temp = ${CRM_PROCES_tree_basedir.temp}
         </echo>
         <!-- 
                  [echo] #427 $out_task.dita.final = /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/temp/Proj6782__/Proj6782___out_task_dita_final.dita , 
@@ -502,7 +505,7 @@
             <arg value="-f" />
             <arg value="pdf"/>
             <arg value="-o"/>
-            <arg value="${out}"/>
+            <arg value="${user.dir}/${out}"/>
         </exec>
         
         <echo message="OUTPUT__START"/>
@@ -512,6 +515,16 @@
         <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>
+            &lt;br&gt;Wyslanie linka mailem : &lt;a href=&quot;mailto:?subject=Wiadomosc nr ${xpath_value}&amp;body=link do sprawy:  ${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot;&gt;Wyslanie linka mailem&lt;/a&gt;   &lt;/br&gt; 
+        </echo>
+        <antcall target="send_email.send_email_from_xml_parsed">
+            <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
+            <param name="antFunctionUrl" value="${antFunctionUrl}"/>
+            <param name="confirmAntfile" value="${confirmAntfile}"/>
+            <param name="confirmAntfileTarget" value="${confirmAntfileTarget}"/>
+            <param name="out.pdf" value="${user.dir}/${out}/${out_task.dita.final.noext}.pdf"/>
+        </antcall>
         <echo message="OUTPUT__END"/>
         <record name="recursed.log" action="stop" />
     </target>

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

@@ -5,7 +5,8 @@
         Umowa
     </description>
     
-    <!--<echo>#88 $uuid = ${uuid}</echo>--><!-- template do kopiowania test-druk @2017-03-02 bindera 
+    <!--<echo>#88 $uuid = ${uuid}</echo>-->
+    <!-- template do kopiowania test-druk @2017-03-02 bindera 
     Copyright BIALL-NET sp. z o.o. wszelkie prawa zastrzezone
     
     -->
@@ -36,7 +37,7 @@
         -Dxpath=ID -Dxpath_value=1000 
         -Duuid=1 -DwebRootUrl=somePathDir-->
     
-<include file="build.recurse_ant.PRODUCT.xml"/>
+    <include file="build.recurse_ant.PRODUCT.xml"/>
     <include file="${basedir}/../build_SE.xml" as="p5build_SE"/><!-- for paths and dirs create in some tasks -->
     <!--<include file="${p5build_SE.build}" as="p5build_SE"/> <!-\- for paths and dirs create in some tasks -\->-->
     <include file="${send_email.build.xml}" as="send_email"/>
@@ -436,7 +437,7 @@
     </target>
    
    
-    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
+    <target name="xml_recursed_from_tr_map_with_RelatedFeatureLoop_tree_to_dita_wfs_recursed" unless="confirmAntfile.isset" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita,confirmAntfile" description="URL_TASK Wygeneruj druk z obiektu uzywajac styli systemowych za pomoca funkcji xsl_recursed">
         <record name="recursed.log" action="start" />
         
         <exec  executable="bash" dir="." outputproperty="out_task_file">
@@ -447,6 +448,7 @@
         <echo>#427 $out_task.dita.final = ${out_task.dita.final} , $out = ${out} , $out_task_file =  ${out_task_file}
             $out_task.dita.final.noext = ${out_task.dita.final.noext}
             $out_task.dita.final_with_RelatedFeatureLoop = ${out_task.dita.final_with_RelatedFeatureLoop}
+            $CRM_PROCES_tree_basedir.temp = ${CRM_PROCES_tree_basedir.temp}
         </echo>
         <!-- 
                  [echo] #427 $out_task.dita.final = /Users/a.binder/Documents/se/SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/temp/Proj6782__/Proj6782___out_task_dita_final.dita , 
@@ -503,7 +505,7 @@
             <arg value="-f" />
             <arg value="pdf"/>
             <arg value="-o"/>
-            <arg value="${out}"/>
+            <arg value="${user.dir}/${out}"/>
         </exec>
         
         <echo message="OUTPUT__START"/>
@@ -513,6 +515,16 @@
         <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>
+            &lt;br&gt;Wyslanie linka mailem : &lt;a href=&quot;mailto:?subject=Wiadomosc nr ${xpath_value}&amp;body=link do sprawy:  ${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot;&gt;Wyslanie linka mailem&lt;/a&gt;   &lt;/br&gt; 
+        </echo>
+        <antcall target="send_email.send_email_from_xml_parsed">
+            <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
+            <param name="antFunctionUrl" value="${antFunctionUrl}"/>
+            <param name="confirmAntfile" value="${confirmAntfile}"/>
+            <param name="confirmAntfileTarget" value="${confirmAntfileTarget}"/>
+            <param name="out.pdf" value="${user.dir}/${out}/${out_task.dita.final.noext}.pdf"/>
+        </antcall>
         <echo message="OUTPUT__END"/>
         <record name="recursed.log" action="stop" />
     </target>