likwidacja ${url} - nadpisuje w podfunkcjach zmienna lokalna

SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xml

@@ -50,7 +50,7 @@
     <property name="php_session_id" value="${php_session_id}"/> <!-- optional cookie if sent work with it if not - get it -->
     <property name="api_url" value="https://biuro.biall-net.pl/SE/version-git/wfs-data.php"/>
     <!--<property name="url" value="${url}"/>-->
-    <property name="url" value="${api_url}"/>
+    <!--<property name="url" value="${api_url}"/>-->
     <property name="webRootUrl" value="${$webRootUrl}"/>
 
     
@@ -557,7 +557,7 @@
             
             <param name="build_recurse_ant.xsl" expression="${build_recurse_ant.xsl}"/>
             <param name="passwordBase64Basic" expression="${passwordBase64Basic_tested}"/>
-            <param name="url" expression="${url}" />
+            <!--<param name="url" expression="${url}" />-->
             <param name="webRootUrl" expression="${webRootUrl}" /> 
             <param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita_with_id}"/>
             <param name="uuid" expression="${uuid_tested}"/>

SE/se-lib/Route/UrlAction/Ant.php

@@ -122,8 +122,8 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $outputFunctionUrl = $this->getLink('output') . "&path={$path}&file=";
       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
-      $testUrl = Request::getPathUri() .  "wfs-data.php" ;// &REQUEST=GetFeature
+      $testUrl = Request::getPathUri() . "wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&TYPENAME={$typeName}&SRSNAME=EPSG:3003&featureID={$objectName}.{$primaryKey}";// &REQUEST=GetFeature
+    //  $testUrl = Request::getPathUri() .  "wfs-data.php" ;// &REQUEST=GetFeature
 
       $cryptedPass = base64_encode(User::getLogin() . ":" . Crypt::decrypt($_SESSION['ADM_PASS_HASH']));
       $uniqID = date("Y-m-d-H_i_s") . substr(md5(time()), 0, 6);// TODO: uniq id for every request
@@ -131,7 +131,7 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $cmd = "cd {$this->pathUrlActions}{$path} && ant -S";
       $cmd .= " -DoutputFunctionUrl='{$outputFunctionUrl}'";
       $cmd .= " -DwebRootUrl='{$webRootUrl}'";
-      $cmd .= " -Durl='{$testUrl}'";
+//      $cmd .= " -Durl='{$testUrl}'";  nie mozna tego uzywac, bo nadpisuje property w funkcji build_get_wfs.xml
       $cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";
       $cmd .= " -Duuid=\"{$uniqID}\"";
       $cmd .= " -Dphp_session_id=\"" . session_id() . "\"";