a.binder 8 年 前
コミット
5563f27937

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

@@ -1189,6 +1189,7 @@
             <!-- menu               https://biuro.biall-net.pl/SE/version-git/index.php?_route=UrlAction_Ant&typeName=default_db:IN7_DZIENNIK_KORESP&primaryKey=63007 -->
             <!-- 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 -->
             <!-- 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 -->
             <!-- 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= -->
             <!-- $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 -->
             <!-- 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-->
             <!-- 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-->
@@ -1201,7 +1202,8 @@
             $xpath_value = ${xpath_value}
             $xpath_value = ${xpath_value}
             $api_url = ${api_url}
             $api_url = ${api_url}
             $outputFunctionUrl = ${outputFunctionUrl}
             $outputFunctionUrl = ${outputFunctionUrl}
-            DantFunctionUrl = ${antFunctionUrl}
+            $antFunctionUrl = ${antFunctionUrl}
+            $confirmAntfile = ${confirmAntfile} / $confirmAntfileTarget = ${$confirmAntfileTarget}
         </echo>
         </echo>
         <!--<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; 
             &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; 

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

@@ -101,6 +101,8 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $nsPrefix = $parsedInfo['prefix'];
       $nsPrefix = $parsedInfo['prefix'];
       $objectName = $parsedInfo['name'];
       $objectName = $parsedInfo['name'];
       $template = V::get('template', '', $_GET);
       $template = V::get('template', '', $_GET);
+      $confirmAntfile = V::get('confirmAntfile', '', $_GET);
+      $confirmAntfileTarget = V::get('confirmAntfileTarget', '', $_GET);
 
 
       // TODO: validate missing ...
       // TODO: validate missing ...
       DBG::log($_GET, 'array', '$_GET');
       DBG::log($_GET, 'array', '$_GET');
@@ -132,6 +134,8 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $cmd = "cd {$this->pathUrlActions}{$path} && ant -S";
       $cmd = "cd {$this->pathUrlActions}{$path} && ant -S";
       $cmd .= " -DoutputFunctionUrl='{$outputFunctionUrl}'";
       $cmd .= " -DoutputFunctionUrl='{$outputFunctionUrl}'";
       $cmd .= " -DantFunctionUrl='{$antFunctionUrl}'";
       $cmd .= " -DantFunctionUrl='{$antFunctionUrl}'";
+      $cmd .= " -DconfirmAntfile={$confirmAntfile}";
+      $cmd .= " -DconfirmAntfileTarget={$confirmAntfileTarget}";
       $cmd .= " -DwebRootUrl='{$webRootUrl}'";
       $cmd .= " -DwebRootUrl='{$webRootUrl}'";
 //      $cmd .= " -Durl='{$testUrl}'";  nie mozna tego uzywac, bo nadpisuje property w funkcji build_get_wfs.xml
 //      $cmd .= " -Durl='{$testUrl}'";  nie mozna tego uzywac, bo nadpisuje property w funkcji build_get_wfs.xml
       $cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";
       $cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";