|
|
@@ -122,7 +122,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}&confirmAntfile={$confirmAntfile}&confirmAntfileTarget={$confirmAntfileTarget}"; //do confirmacji potrzebne - wzglednie przetwarzac z tresci output URL_TASK - ale potrzebne parametry analogiczne aby chodzily
|
|
|
+ $antFunctionUrl = $this->getLink('ant') . "&path={$path}&file={$file}&template={$template}&typeName={$typeName}&primaryKey={$primaryKey}&primaryKeyField={$pkField}"; // &confirmAntfile={$confirmAntfile}&confirmAntfileTarget={$confirmAntfileTarget} sdo 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
|
|
|
@@ -134,8 +134,8 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
|
|
|
$cmd = "cd {$this->pathUrlActions}{$path} && ant -S";
|
|
|
$cmd .= " -DoutputFunctionUrl='{$outputFunctionUrl}'";
|
|
|
$cmd .= " -DantFunctionUrl='{$antFunctionUrl}'";
|
|
|
- $cmd .= " -DconfirmAntfile={$confirmAntfile}";
|
|
|
- $cmd .= " -DconfirmAntfileTarget={$confirmAntfileTarget}";
|
|
|
+ if( strlen($confirmAntfile) > 0 ) $cmd .= " -DconfirmAntfile={$confirmAntfile}";
|
|
|
+ if( strlen($confirmAntfileTarget) > 0 ) $cmd .= " -DconfirmAntfileTarget={$confirmAntfileTarget}";
|
|
|
$cmd .= " -DwebRootUrl='{$webRootUrl}'";
|
|
|
// $cmd .= " -Durl='{$testUrl}'"; nie mozna tego uzywac, bo nadpisuje property w funkcji build_get_wfs.xml
|
|
|
$cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";
|
