a.binder 6 年之前
父节点
当前提交
bd9cf973c1
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7 5
      SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

+ 7 - 5
SE/schema/WPS_Functions/default_db/recurse_ant/build_recurse_ant.xml

@@ -1261,7 +1261,9 @@
             
             
         </echo>
         </echo>
         
         
-        
+        <!--${temp} /opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/recurse_ant/2019-10-21-03_19_53962083
+         a jest w out/2019-10-21-03_19_53962083/pdf
+        -->
         
         
       
       
         
         
@@ -1277,7 +1279,7 @@
         </exec>
         </exec>
         <exec  executable="bash" dir="." outputproperty="out_task_file">
         <exec  executable="bash" dir="." outputproperty="out_task_file">
             <arg value="-c"/>
             <arg value="-c"/>
-            <arg value="echo ${out_task.dita.final} |sed 's/^.*\///'"/>
+            <arg value="echo ${temp} |sed 's/^.*\///' "/><!-- |awk '{ print $1&quot;.pdf&quot; }' -->
         </exec>
         </exec>
         
         
         
         
@@ -1287,10 +1289,10 @@
             &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; 
             &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>-->
         <echo>
         <echo>
-            &lt;br&gt;Wygenerowano druk pdf - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${out_task.dita.final.noext}.pdf&lt;/a&gt;&lt;/br&gt; 
+            &lt;br&gt;Wygenerowano druk pdf - sciagnij go &lt;a href=&quot;${webRootUrl}/${out}/${out_task_file}.pdf&quot; target=&quot;_blank&quot;&gt; &quot;${webRootUrl}/${out}/${out_task_file}.pdf&lt;/a&gt;&lt;/br&gt; 
         </echo>
         </echo>
         <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; 
+            &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_file}.pdf&quot;&gt;Wyslanie linka mailem&lt;/a&gt;   &lt;/br&gt; 
         </echo>
         </echo>
         <!--<echo message="OUTPUT__END"/>-->
         <!--<echo message="OUTPUT__END"/>-->
         <antcall target="send_email.send_email_from_xml_parsed">
         <antcall target="send_email.send_email_from_xml_parsed">
@@ -1298,7 +1300,7 @@
             <param name="antFunctionUrl" value="${antFunctionUrl}"/>
             <param name="antFunctionUrl" value="${antFunctionUrl}"/>
             <param name="confirmAntfile" value="${confirmAntfile}"/>
             <param name="confirmAntfile" value="${confirmAntfile}"/>
             <param name="confirmAntfileTarget" value="${confirmAntfileTarget}"/>
             <param name="confirmAntfileTarget" value="${confirmAntfileTarget}"/>
-            <param name="out.pdf" value="${user.dir}/${out}/${out_task.dita.final.noext}.pdf"/>
+            <param name="out.pdf" value="${user.dir}/${out}/${out_task_file}.pdf"/>
         </antcall>
         </antcall>
         <!--<echo message="OUTPUT__START"/>-->
         <!--<echo message="OUTPUT__START"/>-->
         <echo>
         <echo>