a.binder 8 lat temu
rodzic
commit
e310f7ec2d

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

@@ -1185,8 +1185,15 @@
             <param name="send_email.xml_to_parse.xml" value="${out_task.dita.final}"/>
         </antcall>
         <echo>
-            <!-- 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-->
+            <!-- $template = V::get('template', '', $_GET); -->
+            <!-- menu               https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007 -->
+            <!-- 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 -->
+            <!-- $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}
@@ -1194,6 +1201,7 @@
             $xpath_value = ${xpath_value}
             $api_url = ${api_url}
             $outputFunctionUrl = ${outputFunctionUrl}
+            DantFunctionUrl = ${$antFunctionUrl}
         </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; 

+ 3 - 0
SE/se-lib/Route/UrlAction/Ant.php

@@ -120,6 +120,7 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
 
       $webRootUrl = Request::getPathUri() . "schema/ant-url_action/{$path}";// TODO: security - only for test
       $outputFunctionUrl = $this->getLink('output') . "&path={$path}&file=";
+      $antFunctionUrl = $this->getLink('ant') . "&path={$path}&file={$file}&template={$template}&typeName={$typeName}&primaryKey={$primaryKey}&primaryKeyField={$pkField}"; //do confirmacji potrzebne - wzglednie przetwarzac z tresci output URL_TASK - ale potrzebne parametry analogiczne aby chodzily
       DBG::log([ 'msg'=>'$webRootUrl', '$webRootUrl'=>$webRootUrl]);
       DBG::log([ 'msg'=>'$outputFunctionUrl', '$outputFunctionUrl'=>$outputFunctionUrl]);
       $testUrl = Request::getPathUri() . "wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&TYPENAME={$typeName}&SRSNAME=EPSG:3003&featureID={$objectName}.{$primaryKey}";// &REQUEST=GetFeature
@@ -130,6 +131,7 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       // $cmd = "{$this->pathUrlActions}{$path}/do_build.sh";
       $cmd = "cd {$this->pathUrlActions}{$path} && ant -S";
       $cmd .= " -DoutputFunctionUrl='{$outputFunctionUrl}'";
+      $cmd .= " -DantFunctionUrl='{$antFunctionUrl}'";
       $cmd .= " -DwebRootUrl='{$webRootUrl}'";
 //      $cmd .= " -Durl='{$testUrl}'";  nie mozna tego uzywac, bo nadpisuje property w funkcji build_get_wfs.xml
       $cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";
@@ -137,6 +139,7 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $cmd .= " -Dphp_session_id=\"" . session_id() . "\"";
       $cmd .= " -Dxpath={$pkField}";
       $cmd .= " -Dxpath_value={$primaryKey}";
+      $cmd .= " -Dtemplate={$template}";
       $cmd .= " -Dapi_url=".Request::getPathUri()."wfs-data.php"; //potrzebuje ten parametr do dzialania w AMS itp
       $cmd .= " -DtypeName=\"{$typeName}\"";
       if ($template) $cmd .= " {$template} ";