paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-06 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Implement GetDisplayName and add ParamByName() implementation.

Browse Source 
git-svn-id: trunk@16158 -
This commit is contained in:
michael 2010-10-14 09:57:57 +00:00
parent 73b1fa667c
commit 89df75c731
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/fcl-web/src/jsonrpc/fpjsonrpc.pp
View File

@ -22,6 +22,8 @@ Type
FRequired: Boolean; FRequired: Boolean;
FType: TJSONtype; FType: TJSONtype;
procedure SetName(const AValue: TJSONStringType); procedure SetName(const AValue: TJSONStringType);
protected
function GetDisplayName: string; override;
public public
Constructor Create(ACollection : TCollection); override; Constructor Create(ACollection : TCollection); override;
Procedure Assign(Source : TPersistent); override; Procedure Assign(Source : TPersistent); override;
@ -59,6 +61,7 @@ Type
FOnParamError: TJSONParamErrorEvent; FOnParamError: TJSONParamErrorEvent;
FOptions: TJSONRPCOptions; FOptions: TJSONRPCOptions;
FParamDefs: TJSONParamDefs; FParamDefs: TJSONParamDefs;
FExecParams : TJSONData;
procedure SetParamDefs(const AValue: TJSONParamDefs); procedure SetParamDefs(const AValue: TJSONParamDefs);
Protected Protected
function CreateParamDefs: TJSONParamDefs; virtual; function CreateParamDefs: TJSONParamDefs; virtual;
@ -72,6 +75,7 @@ Type
Constructor Create(AOwner : TComponent); override; Constructor Create(AOwner : TComponent); override;
Destructor Destroy; override; Destructor Destroy; override;
Procedure CheckParams(Const Params : TJSONData); Procedure CheckParams(Const Params : TJSONData);
Function ParamByName(Const AName : String) : TJSONData;
Function Execute(Const Params : TJSONData; AContext : TJSONRPCCallContext = Nil) : TJSONData; Function Execute(Const Params : TJSONData; AContext : TJSONRPCCallContext = Nil) : TJSONData;
Property ParamDefs : TJSONParamDefs Read FParamDefs Write SetParamDefs; Property ParamDefs : TJSONParamDefs Read FParamDefs Write SetParamDefs;
end; end;
@ -433,6 +437,13 @@ begin
FName:=AValue; FName:=AValue;
end; end;
function TJSONParamDef.GetDisplayName: string;
begin
Result:=FName;
If (Result='') then
Result:=Inherited GetDisplayName;
end;
constructor TJSONParamDef.Create(ACollection: TCollection); constructor TJSONParamDef.Create(ACollection: TCollection);
begin begin
inherited Create(ACollection); inherited Create(ACollection);
@ -531,6 +542,33 @@ begin
end; end;
end; end;
function TCustomJSONRPCHandler.ParamByName(const AName: String): TJSONData;
Var
I : Integer;
N : String;
begin
If (FExecParams=Nil) or Not (FExecParams.JSONType in [jtArray,jtObject]) then
Result:=Nil
else
begin
I:=ParamDefs.IndexOfParamDef(AName);
If (I=-1) then
N:=AName
else
N:=ParamDefs[i].Name; // Search with original defined name.
If (FExecParams is TJSONObject) then
Result:=TJSONObject(FExecParams).Elements[N]
else if (FExecParams is TJSONArray) then
begin
If (I=-1) or (I>=FExecParams.Count) then
JSONRPCError(SErrUnknownParamDef,[AName]);
Result:=TJSONArray(FExecParams).Items[i];
end;
end;
end;
procedure TCustomJSONRPCHandler.SetParamDefs(const AValue: TJSONParamDefs); procedure TCustomJSONRPCHandler.SetParamDefs(const AValue: TJSONParamDefs);
begin begin
if FParamDefs=AValue then exit; if FParamDefs=AValue then exit;
@ -574,7 +612,12 @@ begin
FBeforeExecute(Self); FBeforeExecute(Self);
if (jroCheckParams in Options) then if (jroCheckParams in Options) then
CheckParams(Params); CheckParams(Params);
Result:=DoExecute(Params,AContext); FExecParams:=Params;
try
Result:=DoExecute(Params,AContext);
finally
FExecParams:=Nil;
end;
If Assigned(FAfterExecute) then If Assigned(FAfterExecute) then
FAfterExecute(Self); FAfterExecute(Self);
end; end;