ソースを参照

added php_session_id for curl in Ant url action

Piotr Labudda 9 年 前
コミット
0d9702239d

+ 7 - 8
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-get-wfs-xml/build.xml

@@ -20,13 +20,14 @@
     <property name="uuid" value="${uuid}"/>
     <property name="passwordBase64Basic" value="${passwordBase64Basic}"/>
     <property name="url" value="${url}"/>
+    <property name="php_session_id" value="${php_session_id}"/>
     <property name="webRootUrl" value="${webRootUrl}"/>
 
     <target name="http_first_input">
+        <echo message="FETCHING '${url}' ..."/>
         <exec executable="curl" outputproperty="wfs_output" errorproperty="wfs_error" resultproperty="wfs_result">
-            <arg line="-H 'Authorization: Basic ${passwordBase64Basic}' ${url}&amp;REQUEST=GetFeature"/>
+            <arg line="--cookie 'PHPSESSID=${php_session_id}' '${url}&amp;REQUEST=GetFeature'"/>
         </exec>
-        <echo message="curl -H 'Authorization: Basic ${passwordBase64Basic}' '${url}'"/>
         <echo message="OUTPUT__TYPE__XML"/>
         <echo message="OUTPUT__START"/>
         <echo message="${wfs_output}"/>
@@ -45,13 +46,11 @@
         <echo message="ERROR__END"/>
     </target>
 
-    
-    
     <target name="DescribeFeatureType" description="URL_TASK Target DescribeFeatureType">
+        <echo message="FETCHING '${url}' ..."/>
         <exec executable="curl" outputproperty="wfs_output" errorproperty="wfs_error" resultproperty="wfs_result">
-            <arg line="-H 'Authorization: Basic ${passwordBase64Basic}' ${url}&amp;REQUEST=DescribeFeatureType"/>
+            <arg line="--cookie 'PHPSESSID=${php_session_id}' '${url}&amp;REQUEST=DescribeFeatureType'"/>
         </exec>
-        <echo message="curl -H 'Authorization: Basic ${passwordBase64Basic}' '${url}'"/>
         <echo message="OUTPUT__TYPE__XML"/>
         <echo message="OUTPUT__START"/>
         <echo message="${wfs_output}"/>
@@ -71,10 +70,10 @@
     </target>
 
     <target name="GetFeature" description="URL_TASK Target GetFeature">
+        <echo message="FETCHING '${url}' ..."/>
         <exec executable="curl" outputproperty="wfs_output" errorproperty="wfs_error" resultproperty="wfs_result">
-            <arg line="-H 'Authorization: Basic ${passwordBase64Basic}' ${url}&amp;REQUEST=GetFeature"/>
+            <arg line="--cookie 'PHPSESSID=${php_session_id}' '${url}&amp;REQUEST=GetFeature'"/>
         </exec>
-        <echo message="curl -H 'Authorization: Basic ${passwordBase64Basic}' '${url}'"/>
         <echo message="OUTPUT__TYPE__XML"/>
         <echo message="OUTPUT__START"/>
         <echo message="${wfs_output}"/>

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

@@ -132,6 +132,7 @@ class Route_UrlAction_Ant extends Route_Ant {// @doc @see Route_Ant
       $cmd .= " -Durl='{$testUrl}'";
       $cmd .= " -DpasswordBase64Basic=\"{$cryptedPass}\"";
       $cmd .= " -Duuid=\"{$uniqID}\"";
+      $cmd .= " -Dphp_session_id=\"" . session_id() . "\"";
       $cmd .= " -Dxpath={$pkField}";
       $cmd .= " -Dxpath_value={$primaryKey}";
       $cmd .= " -DtypeName=\"{$typeName}\"";