From 27705788ce8aca29f524acb2796689a49e68ed72 Mon Sep 17 00:00:00 2001 From: inoussa Date: Fri, 2 Jul 2010 15:43:58 +0000 Subject: [PATCH] small fix : remove file writing, fix interface reference git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1244 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../lazarus/wstmodule/demo/demoservice.lpi | 300 +++++++++++------- .../lazarus/wstmodule/demo/demoservice.lpr | 4 +- .../wstmodule/demo/user_service_intf_imp.pas | 4 +- .../ide/lazarus/wstmodule/demo/wmhandler.lfm | 4 +- .../ide/lazarus/wstmodule/demo/wmhandler.lrs | 2 +- wst/trunk/ide/lazarus/wstmodule/fclwebwst.lpk | 1 + wst/trunk/ide/lazarus/wstmodule/wstmodule.pas | 35 +- 7 files changed, 194 insertions(+), 156 deletions(-) diff --git a/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpi b/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpi index b035af4b8..c7e34d72c 100644 --- a/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpi +++ b/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpi @@ -28,30 +28,33 @@ - + - + - + - + - + + + + - + - + - - + + @@ -62,51 +65,51 @@ - - - - + + + + + - - + + + - - - - - + + + - + - - - + + + - + - - - + + + @@ -115,7 +118,7 @@ - + @@ -128,22 +131,19 @@ - - - - + + + - - @@ -244,22 +244,18 @@ - - - - @@ -271,32 +267,26 @@ - - - - - - @@ -304,12 +294,10 @@ - - @@ -330,22 +318,18 @@ - - - - @@ -357,160 +341,224 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -520,9 +568,15 @@ - + + + + + + + diff --git a/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpr b/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpr index f646c58c2..dcb6d58d4 100644 --- a/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpr +++ b/wst/trunk/ide/lazarus/wstmodule/demo/demoservice.lpr @@ -4,9 +4,9 @@ program demoservice; uses fpCGI, wmhandler, imp_helper, user_service_intf, user_service_intf_binder, - user_service_intf_imp, user_service_intf_proxy; + user_service_intf_imp, user_service_intf_proxy, wst_core; -{$IFDEF WINDOWS}{$R demoservice.rc}{$ENDIF} +{$R *.res} begin Application.Initialize; diff --git a/wst/trunk/ide/lazarus/wstmodule/demo/user_service_intf_imp.pas b/wst/trunk/ide/lazarus/wstmodule/demo/user_service_intf_imp.pas index a5871f294..388f3b8c5 100644 --- a/wst/trunk/ide/lazarus/wstmodule/demo/user_service_intf_imp.pas +++ b/wst/trunk/ide/lazarus/wstmodule/demo/user_service_intf_imp.pas @@ -220,9 +220,9 @@ end; initialization FUserList := TObjectList.Create(True); FUserCursor := TObjectListCursor.Create(FUserList); - {if FileExists(sDATA_FILE_NAME) then + if FileExists(sDATA_FILE_NAME) then FillDataFromFile(sDATA_FILE_NAME) - else} + else FillSampleData(); finalization diff --git a/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lfm b/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lfm index 12bc763b4..9c61f0f23 100644 --- a/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lfm +++ b/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lfm @@ -1,7 +1,7 @@ object WSTModule1: TWSTModule1 OldCreateOrder = False Height = 300 - HorizontalOffset = 635 - VerticalOffset = 230 + HorizontalOffset = 720 + VerticalOffset = 252 Width = 400 end diff --git a/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lrs b/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lrs index 3f32e5c86..a1f528e7c 100644 --- a/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lrs +++ b/wst/trunk/ide/lazarus/wstmodule/demo/wmhandler.lrs @@ -2,5 +2,5 @@ LazarusResources.Add('TWSTModule1','FORMDATA',[ 'TPF0'#11'TWSTModule1'#10'WSTModule1'#14'OldCreateOrder'#8#6'Height'#3','#1#16 - +'HorizontalOffset'#3'{'#2#14'VerticalOffset'#3#230#0#5'Width'#3#144#1#0#0 + +'HorizontalOffset'#3#208#2#14'VerticalOffset'#3#252#0#5'Width'#3#144#1#0#0 ]); diff --git a/wst/trunk/ide/lazarus/wstmodule/fclwebwst.lpk b/wst/trunk/ide/lazarus/wstmodule/fclwebwst.lpk index 1e37d9de3..b86f4a5e4 100644 --- a/wst/trunk/ide/lazarus/wstmodule/fclwebwst.lpk +++ b/wst/trunk/ide/lazarus/wstmodule/fclwebwst.lpk @@ -12,6 +12,7 @@ + diff --git a/wst/trunk/ide/lazarus/wstmodule/wstmodule.pas b/wst/trunk/ide/lazarus/wstmodule/wstmodule.pas index adc409cc6..7432dde17 100644 --- a/wst/trunk/ide/lazarus/wstmodule/wstmodule.pas +++ b/wst/trunk/ide/lazarus/wstmodule/wstmodule.pas @@ -5,7 +5,8 @@ unit wstmodule; interface uses - Classes, SysUtils, httpdefs, fphttp, server_service_imputils, websession; + Classes, SysUtils, httpdefs, fphttp, server_service_imputils, websession, + server_service_intf; const sWSDL = 'WSDL'; @@ -31,7 +32,7 @@ Type procedure ProcessServiceRequest(ARequest: TRequest; AResponse: TResponse; AFormat : String); procedure ProcessWSDLRequest(ARequest: TRequest; AResponse: TResponse); Protected - procedure AddSessionProperties(ARequest: TRequest; WSTRequest: TRequestBuffer); virtual; + procedure AddSessionProperties(ARequest: TRequest; WSTRequest: IRequestBuffer); virtual; property BeforeGenerateWSDLTable : TNotifyEvent Read FBeforeGenerateWSDLTable Write FBeforeGenerateWSDLTable; property AfterGenerateWSDLTable : TNotifyEvent Read FAfterGenerateWSDLTable Write FAfterGenerateWSDLTable; property BeforeGenerateWSDL : TWSTServiceEvent Read FBeforeGenerateWSDL Write FBeforeGenerateWSDL; @@ -66,7 +67,6 @@ implementation { $define wmdebug} uses {$ifdef wmdebug}dbugintf,{$endif}base_service_intf, - server_service_intf, metadata_repository, metadata_wsdl, dom,xmlwrite, metadata_service, metadata_service_binder; @@ -168,7 +168,7 @@ begin {$ifdef wmdebug}SendDebug('Exiting ProcessWSDLRequest');{$endif} end; -Procedure TCustomWSTModule.AddSessionProperties(ARequest : TRequest; WSTRequest : TRequestBuffer); +Procedure TCustomWSTModule.AddSessionProperties(ARequest : TRequest; WSTRequest : IRequestBuffer); Var P : IPropertyManager; @@ -177,7 +177,7 @@ Var N,V : String; begin - P:=(WSTRequest As IRequestBuffer).GetPropertyManager(); + P:=WSTRequest.GetPropertyManager(); If CreateSession and Assigned(Session) then P.SetProperty('SessionID',Self.Session.SessionID); P.SetProperty(SRemote_IP,ARequest.RemoteAddress); @@ -201,15 +201,12 @@ end; Procedure TCustomWSTModule.ProcessServiceRequest(ARequest : TRequest; AResponse : TResponse; AFormat : String); var ServiceName,ContentType : string; - rqst : TRequestBuffer; + rqst : IRequestBuffer; inStream, outStream: TStringStream; B : Boolean; - F : TFileStream; - begin {$ifdef wmdebug}SendDebug('Entering ProcessServiceRequest');{$endif} ServiceName:=ARequest.GetNextPathInfo; -// TServiceRequestEvent = procedure(Sender : TObject; Const AServiceName : String; Var Handled : Boolean); {$ifdef wmdebug}SendDebug(Format('ProcessServiceRequest: Servicename = "%s"',[ServiceName]));{$endif} B:=False; If Assigned(FBeforeService) then @@ -218,13 +215,6 @@ begin begin inStream := TStringStream.Create(ARequest.Content); try - F:=TFileStream.Create('/tmp/request',fmCreate); - try - F.CopyFrom(InStream,0); - Instream.Position:=0; - finally - F.Free; - end; outStream := TStringStream.Create(''); try ContentType:= ARequest.ContentType; @@ -261,8 +251,6 @@ procedure TCustomWSTModule.HandleRequest(ARequest: TRequest; Var AFormat : String; - F : TFileStream; - begin {$ifdef wmdebug}SendDebug('Entering HandleRequest');{$endif} try @@ -282,14 +270,8 @@ begin except On E : Exception do begin - {$ifdef wmdebug}SendDebug('Error during HandleRequest : '+E.Message);{$endif} - With TFileStream.Create('/tmp/request-error',fmCreate) do - try - WriteBuffer(E.Message[1],Length(E.Message)); - finally - Free; - end; - Raise; + {$ifdef wmdebug}SendDebug('Error during HandleRequest : '+E.Message);{$endif} + raise; end; end; {$ifdef wmdebug}SendDebug('Exiting HandleRequest');{$endif} @@ -297,3 +279,4 @@ end; end. +