+ XmlRpc format support ( server and client )

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@198 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2007-06-28 23:33:38 +00:00
parent a378b15cb3
commit 6ca7b4a51d
28 changed files with 1789 additions and 572 deletions
--- a/wst/trunk/samples/apache_module/mod_wst.lpi
+++ b/wst/trunk/samples/apache_module/mod_wst.lpi
@@ -24,24 +24,24 @@
        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
      </local>
    </RunParams>
-    <Units Count="7">
+    <Units Count="14">
      <Unit0>
        <Filename Value="mod_wst.lpr"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="mod_wst"/>
-        <CursorPos X="1" Y="52"/>
-        <TopLine Value="25"/>
+        <CursorPos X="3" Y="11"/>
+        <TopLine Value="1"/>
        <EditorIndex Value="0"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
        <Loaded Value="True"/>
      </Unit0>
      <Unit1>
        <Filename Value="wst_apache_binding.pas"/>
        <UnitName Value="wst_apache_binding"/>
-        <CursorPos X="46" Y="15"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="16"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="249"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="18"/>
        <Loaded Value="True"/>
      </Unit1>
      <Unit2>
@@ -49,8 +49,8 @@
        <UnitName Value="metadata_wsdl"/>
        <CursorPos X="70" Y="30"/>
        <TopLine Value="16"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="16"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="18"/>
        <Loaded Value="True"/>
      </Unit2>
      <Unit3>
@@ -58,8 +58,8 @@
        <UnitName Value="user_service_intf_imp"/>
        <CursorPos X="71" Y="20"/>
        <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="16"/>
+        <EditorIndex Value="9"/>
+        <UsageCount Value="18"/>
        <Loaded Value="True"/>
      </Unit3>
      <Unit4>
@@ -82,68 +82,67 @@
        <TopLine Value="61"/>
        <UsageCount Value="9"/>
      </Unit6>
+      <Unit7>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_protocol.inc"/>
+        <CursorPos X="47" Y="799"/>
+        <TopLine Value="777"/>
+        <EditorIndex Value="7"/>
+        <UsageCount Value="12"/>
+        <Loaded Value="True"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.inc"/>
+        <CursorPos X="5" Y="794"/>
+        <TopLine Value="777"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_tables.inc"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="16"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit9>
+      <Unit10>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_config.inc"/>
+        <CursorPos X="71" Y="66"/>
+        <TopLine Value="32"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit10>
+      <Unit11>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.pas"/>
+        <UnitName Value="httpd"/>
+        <CursorPos X="41" Y="134"/>
+        <TopLine Value="117"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit11>
+      <Unit12>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\ap_mmn.inc"/>
+        <CursorPos X="3" Y="111"/>
+        <TopLine Value="96"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
+      </Unit12>
+      <Unit13>
+        <Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/>
+        <CursorPos X="3" Y="48"/>
+        <TopLine Value="678"/>
+        <UsageCount Value="10"/>
+      </Unit13>
    </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
+    <JumpHistory Count="1" HistoryIndex="0">
      <Position1>
        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="5" Column="1" TopLine="1"/>
+        <Caret Line="39" Column="14" TopLine="23"/>
      </Position1>
-      <Position2>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="52" Column="5" TopLine="25"/>
-      </Position2>
-      <Position3>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="18" Column="28" TopLine="1"/>
-      </Position3>
-      <Position4>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\metadata_wsdl.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\..\metadata_wsdl.pas"/>
-        <Caret Line="30" Column="70" TopLine="16"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\user_service_intf_imp.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position7>
-      <Position8>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="29" Column="68" TopLine="10"/>
-      </Position8>
-      <Position9>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="312" Column="42" TopLine="291"/>
-      </Position9>
-      <Position10>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="6" Column="22" TopLine="25"/>
-      </Position10>
-      <Position11>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="52" Column="1" TopLine="25"/>
-      </Position11>
-      <Position12>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="30" Column="6" TopLine="25"/>
-      </Position12>
-      <Position13>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="11" Column="7" TopLine="1"/>
-      </Position13>
-      <Position14>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="273" Column="27" TopLine="260"/>
-      </Position14>
-      <Position15>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="7" Column="1" TopLine="1"/>
-      </Position15>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
@@ -153,13 +152,17 @@
      <Filename Value="mod_wst.so"/>
    </Target>
    <SearchPaths>
-      <OtherUnitFiles Value="$(FPCSrcDir)\packages\base\httpd\httpd-2.2\;..\;..\..\;..\..\wst_rtti_filter\"/>
+      <OtherUnitFiles Value="..\;..\..\;..\..\wst_rtti_filter\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\apr\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\apriconv\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\aprutil\"/>
      <UnitOutputDirectory Value="obj"/>
+      <SrcPath Value="$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\apr\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\apriconv\;$(LazarusDir)\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\aprutil\"/>
    </SearchPaths>
    <CodeGeneration>
      <Generate Value="Faster"/>
    </CodeGeneration>
    <Linking>
+      <Debugging>
+        <UseLineInfoUnit Value="False"/>
+      </Debugging>
      <Options>
        <ExecutableType Value="Library"/>
      </Options>
--- a/wst/trunk/samples/apache_module/mod_wst.lpr
+++ b/wst/trunk/samples/apache_module/mod_wst.lpr
@@ -23,7 +23,7 @@ exports
 {$endif}


-function DefaultHandler(r: Prequest_rec): Integer; cdecl;
+function DefaultHandler(r: Prequest_rec): Integer;cdecl;
 begin
  if not SameText(r^.handler, 'wst-handler') then
  begin
@@ -34,7 +34,7 @@ begin
  Result := wst_RequestHandler(r);
 end;

-procedure RegisterHooks(p: Papr_pool_t); cdecl;
+procedure RegisterHooks(p: Papr_pool_t);cdecl;
 begin
  ap_hook_handler(@DefaultHandler, nil, nil, APR_HOOK_MIDDLE);
 end;
--- a/wst/trunk/samples/apache_module/wst_apache_binding.pas
+++ b/wst/trunk/samples/apache_module/wst_apache_binding.pas
@@ -1,4 +1,4 @@
-//{$DEFINE WST_DBG}
+{$DEFINE WST_DBG}

 unit wst_apache_binding;

@@ -35,6 +35,7 @@ type
    URI         : string;
    ContentType : string;
    Buffer      : string;
+    Argument    : string;
  end;
  
  TResponseInfo = record
@@ -232,7 +233,7 @@ begin
      AResponseInfo.ContentType := sHTTP_BINARY_CONTENT_TYPE
    else
      AResponseInfo.ContentType := ctntyp;
-    rqst := TRequestBuffer.Create(trgt,ctntyp,inStream,outStream);
+    rqst := TRequestBuffer.Create(trgt,ctntyp,inStream,outStream,'');
    HandleServiceRequest(rqst);
    i := outStream.Size;
    if ( i > 0 ) then begin
@@ -243,8 +244,8 @@ begin
    outStream.Free();
    inStream.Free();
    {$IFDEF WST_DBG}
-      {SaveStringToFile('RequestInfo.ContentType=' + ARequestInfo.ContentType + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',False);
-      SaveStringToFile('RequestInfo.Buffer=' + ARequestInfo.Buffer + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
+      SaveStringToFile('RequestInfo.ContentType=' + ARequestInfo.Argument + LineEnding,'c:\log.log',False);
+      {SaveStringToFile('RequestInfo.Buffer=' + ARequestInfo.Buffer + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
      SaveStringToFile('RequestInfo.URI=' + ARequestInfo.URI + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
      SaveStringToFile('ResponseInfo.ContentType=' + AResponseInfo.ContentType + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
      SaveStringToFile('ResponseInfo.ContentText=' + AResponseInfo.ContentText + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
@@ -260,6 +261,7 @@ function wst_RequestHandler(r: Prequest_rec): Integer;
    ARequestInfo.ContentType := apr_table_get(r^.headers_in,sCONTENT_TYPE);
    ARequestInfo.Root := ap_get_server_name(r) + sSEPARATOR + sWST_ROOT + sSEPARATOR;
    ARequestInfo.URI := r^.uri;
+    ARequestInfo.Argument := r^.args;
    Result := ReadBuffer(r,ARequestInfo.Buffer);
  end;

@@ -312,7 +314,7 @@ initialization
  RegisterUserServiceImplementationFactory();
  Server_service_RegisterUserServiceService();

-  Server_service_RegisterWSTMetadataServiceService();
  RegisterWSTMetadataServiceImplementationFactory();
+  Server_service_RegisterWSTMetadataServiceService();

 end.