Selaa lähdekoodia

nie dziala ant inaczej

a.binder 9 vuotta sitten
vanhempi
commit
c967ebde6f

+ 1 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build_recurse_ant.xsl

@@ -248,7 +248,7 @@
                                     </xsl:choose>
                                     <echo> related .dita.xml template is: $wfs_output.dita=<xsl:value-of select="$wfs_output.dita"/>; do przetwarzania na podstawie: $wfs_output.xml=<xsl:value-of select="$wfs_output.xml"/>;</echo>
                                     <xsl:comment> teraz podmieniamy dane z otrzymanego xmla do pliku dita aby potem zrobic polaczony plik  w kolejnym wyzwoleniu ant</xsl:comment>
-                                    <delete file="temp/{$wfs_output.dita}.vals.dita"/>
+                                    <!--<delete file="temp/{$wfs_output.dita}.vals.dita"/>-->
                                     <xslt basedir="./" style="{$build_recurse_ant.xsl}" in="temp/{$wfs_output.dita}"  destdir="./" out="temp/{$wfs_output.dita}.vals.dita" >
                                             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                                                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>

+ 5 - 2
SE/se-lib/Route/UrlAction/Ant.php

@@ -73,9 +73,12 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       DBG::log([ 'msg'=>'$outputFunctionUrl', '$outputFunctionUrl'=>$outputFunctionUrl]);
       $testUrl = Request::getPathUri() . "wfs-data.php/default_db/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=".$typeName."&SRSNAME=EPSG:3003&featureID={$objectName}.{$primaryKey}";
       $cryptedPass = base64_encode(User::getLogin() . ":" . Crypt::decrypt($_SESSION['ADM_PASS_HASH']));
-      $cmd = "cd {$this->pathUrlActions}{$path} && {$this->antBin} -S  -DoutputFunctionUrl='{$outputFunctionUrl}' -DwebRootUrl='{$webRootUrl}' -Durl='{$testUrl}' -DpasswordBase64Basic=\"{$cryptedPass}\" -Duuid=\"".session_id()."\" -Dxpath=".$xpath." -Dxpath_value=".$primaryKey." -DtypeName=\"".$typeName."\"  2>&1";
+//      $cmd = "cd {$this->pathUrlActions}{$path} && {$this->antBin}  -DoutputFunctionUrl='{$outputFunctionUrl}' -DwebRootUrl='{$webRootUrl}' -Durl='{$testUrl}' -DpasswordBase64Basic=\"{$cryptedPass}\" -Duuid=\"".session_id()."\" -Dxpath=".$xpath." -Dxpath_value=".$primaryKey." -DtypeName=\"".$typeName."\"  2>&1";
+      $cmd = "{$this->pathUrlActions}{$path}/do_build.sh -DoutputFunctionUrl='{$outputFunctionUrl}' -DwebRootUrl='{$webRootUrl}' -Durl='{$testUrl}' -DpasswordBase64Basic=\"{$cryptedPass}\" -Duuid=\"".session_id()."\" -Dxpath=".$xpath." -Dxpath_value=".$primaryKey." -DtypeName=\"".$typeName."\" ";
+
       DBG::log([ 'msg'=>"cmd", 'cmd'=>str_replace(APP_PATH_ROOT, 'SE', $cmd) ]);
-      V::exec($cmd, $out, $ret);
+      //V::exec($cmd, $out, $ret); to nie dziala prawidlowo
+      V::shell_exec();
       DBG::log([ 'msg'=>"cmd and returns({$ret})", 'output'=>$out ]);
       $html = []; $startRead = false;
       foreach ($out as $line) {