|
|
@@ -38,7 +38,7 @@
|
|
|
-Duuid=1 -DwebRootUrl=somePathDir-->
|
|
|
|
|
|
<include file="build.recurse_ant.PRODUCT.xml"/>
|
|
|
- <include file="${p5build_SE.build}" as="p5build_SE"/> <!-- for paths and dirs create in some tasks -->
|
|
|
+ <include file="${basedir}/../build_SE.xml" as="p5build_SE"/><!-- for paths and dirs create in some tasks --> <!-- for paths and dirs create in some tasks -->
|
|
|
<include file="${send_email.build.xml}" as="send_email"/>
|
|
|
|
|
|
<property name="basedir" location="${basedir}" /> <!-- do ustalenia glownego katalogu -->
|
|
|
@@ -77,9 +77,9 @@
|
|
|
<!-- DO NOT SET --><property name="parallel_pos" value="1"/>
|
|
|
<!--<property name="temp_name" value="temp" />--> <!-- temp files-->
|
|
|
<property name="temp" value="${default_db:recurse_ant_basedir.temp}${loop_path_recurs}" /> <!-- temp files-->
|
|
|
- <echo>#75 before $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}</echo>
|
|
|
+ <!--<echo>#75 before $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}</echo>-->#75 before $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}
|
|
|
<property name="xpath_query.xsl" value="${default_db:recurse_ant_basedir.temp}/${uuid}.xpath_query.xsl"/>
|
|
|
- <echo>#76 after $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}</echo>
|
|
|
+ <!--<echo>#76 after $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}</echo>-->#76 after $xpath_query.xsl = ${xpath_query.xsl} , $uuid = ${uuid}
|
|
|
<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"/>
|
|
|
@@ -1107,8 +1107,8 @@
|
|
|
</target>
|
|
|
|
|
|
|
|
|
- <target name="buildpdf_recursed_xsl_mail" 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 - with send mail">
|
|
|
- <record name="buildpdf_recursed_xsl.log" action="start" />
|
|
|
+ <target name="buildpdf_recursed_xsl_mail" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,set_dita" description="URL_TASK buildpdf_recursed_xsl_mail szybki druk z wysylka mailem">
|
|
|
+ <record name="buildpdf_recursed_xsl_mail.log" action="start" />
|
|
|
<echo>#836 will try to in $main_build_recurse_ant.dita_with_id ${main_build_recurse_ant.dita_with_id} , $empty.xml = ${empty.xml}</echo>
|
|
|
<echoxml file="${empty.xml}">
|
|
|
<empty>empty</empty>
|
|
|
@@ -1153,11 +1153,8 @@
|
|
|
<arg value="${out}"/>
|
|
|
</exec>-->
|
|
|
|
|
|
- <antcall target="send_email.send_email_from_xml_parsed">
|
|
|
- <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
|
|
|
- </antcall>
|
|
|
|
|
|
- <exec executable="${dita.dir}" dir=".">
|
|
|
+<exec executable="${dita.dir}" dir=".">
|
|
|
<arg value="-i"/>
|
|
|
<arg value="${out_task.dita.final}" />
|
|
|
<!-- <arg value="-t" />
|
|
|
@@ -1165,7 +1162,7 @@
|
|
|
<arg value="-f" />
|
|
|
<arg value="pdf"/>
|
|
|
<arg value="-o"/>
|
|
|
- <arg value="${out}"/>
|
|
|
+ <arg value="${user.dir}/${out}"/>
|
|
|
</exec>
|
|
|
<exec executable="bash" dir="." outputproperty="out_task_file">
|
|
|
<arg value="-c"/>
|
|
|
@@ -1173,6 +1170,7 @@
|
|
|
</exec>
|
|
|
|
|
|
|
|
|
+<echo> </echo>
|
|
|
<echo message="OUTPUT__START"/>
|
|
|
<!--<echo>
|
|
|
<br>Wygenerowano wyjsciowy plik XML - sciagnij go <a href="${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml" target="_blank"> "${webRootUrl}/${out_task.dita.final_with_RelatedFeatureLoop_no_path}.xml</a></br>
|
|
|
@@ -1183,11 +1181,40 @@
|
|
|
<echo>
|
|
|
<br>Wyslanie linka mailem : <a href="mailto:?subject=Wiadomosc nr ${xpath_value}&body=link do sprawy: ${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf">Wyslanie linka mailem</a> </br>
|
|
|
</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}"/>
|
|
|
+ </antcall>
|
|
|
+ <echo>
|
|
|
+ <!--<echo>
|
|
|
+ <br># Wygenerowano wyjsciowy plik PDF - sciagnij go <a href="${webRootUrl}/${out}/${uuid}.pdf" target="_blank"> "${webRootUrl}/${out}/${uuid}.pdf</a></br>
|
|
|
+
|
|
|
+ </echo>-->-->
|
|
|
+ <!-- menu.choosed https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/etykieta&template=buildpdf_recursed_xsl_mail&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007&primaryKeyField=ID -->
|
|
|
+ <!-- dzialajace https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/etykieta&template=buildpdf_recursed_xsl_mail&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007&primaryKeyField=ID -->
|
|
|
+ <!-- DantFunctionUrl = https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/etykieta&template=buildpdf_recursed_xsl_mail&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007&primaryKeyField=ID -->
|
|
|
+ <!-- $outputFunctionUrl https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=output&path=default_db.in7_dziennik_koresp/etykieta&file= -->
|
|
|
+ <!-- pdf https://biuro.biall-net.pl/SE/version-git/schema/ant-url_action/default_db.in7_dziennik_koresp/etykieta/ out/ 2018-04-20-01_09_2128f9d7_out_task_dita_final.pdf -->
|
|
|
+ <!-- link https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&_task=ant&path=default_db.in7_dziennik_koresp/etykieta&template=buildpdf_recursed_xsl_mail&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007&primaryKeyField=ID-->
|
|
|
+
|
|
|
+ URL_TASK send_email.send_email_from_xml_parsed.confirm
|
|
|
+ Wysłanie mailem przez system ${webRootUrl}
|
|
|
+ $url = ${url}
|
|
|
+ $typeName = ${typeName}
|
|
|
+ $xpath = ${xpath}
|
|
|
+ $xpath_value = ${xpath_value}
|
|
|
+ $api_url = ${api_url}
|
|
|
+ $outputFunctionUrl = ${outputFunctionUrl}
|
|
|
+ $antFunctionUrl = ${antFunctionUrl}
|
|
|
+ $confirmAntfile = ${confirmAntfile} / $confirmAntfileTarget = ${confirmAntfileTarget}
|
|
|
+ </echo>
|
|
|
<!--<echo>
|
|
|
<br># Wygenerowano wyjsciowy plik PDF - sciagnij go <a href="${webRootUrl}/${out}/${uuid}.pdf" target="_blank"> "${webRootUrl}/${out}/${uuid}.pdf</a></br>
|
|
|
</echo>-->
|
|
|
<echo message="OUTPUT__END"/>
|
|
|
- <record name="buildpdf_recursed_xsl.log" action="stop" />
|
|
|
+ <record name="buildpdf_recursed_xsl_mail.log" action="stop" />
|
|
|
</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">
|