Skip to content

Commit 02ec42c

Browse files
author
ronierys2@hotmail.com
committed
correção
- Ajuste para funcionamento de IndexFieldNames Delphi velho a Novo e Lazarus(vlw Rodrigo Guelf) pela força noix sempre. - Correção do ClientConnectionDefs.
1 parent ab13cb5 commit 02ec42c

6 files changed

Lines changed: 541 additions & 148 deletions

File tree

‎CORE/Source/Basic/uRESTDWBasic.pas‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,8 @@ TRESTDWServerIpVersionConfig = class(TPersistent)
435435
baseEventUnit,
436436
vUrlToExec,
437437
aurlContext : String;
438-
Var vRequestHeader : TStringList);
438+
Var vRequestHeader : TStringList;
439+
Var vdwConnectionDefs : TConnectionDefs);
439440
Function ReturnRoute (ServerMethodsClass : TComponent;
440441
Pooler,
441442
urlContext : String;
@@ -2153,7 +2154,8 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
21532154
RequestType, vWelcomeMessage, vAccessTag,
21542155
vdwCriptKey, compresseddata, encodestrings,
21552156
dwassyncexec, vdwservereventname, baseEventUnit,
2156-
vUrlToExec, aurlContext, vRequestHeader);
2157+
vUrlToExec, aurlContext, vRequestHeader,
2158+
vdwConnectionDefs);
21572159
End;
21582160
WelcomeAccept := True;
21592161
tmp := '';
@@ -3636,7 +3638,8 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
36363638
RequestType, vWelcomeMessage, vAccessTag,
36373639
vdwCriptKey, compresseddata, encodestrings,
36383640
dwassyncexec, vdwservereventname, baseEventUnit,
3639-
vUrlToExec, aurlContext, vRequestHeader);
3641+
vUrlToExec, aurlContext, vRequestHeader,
3642+
vdwConnectionDefs);
36403643
End;
36413644
WelcomeAccept := True;
36423645
tmp := '';
@@ -4697,7 +4700,6 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
46974700
Begin
46984701
// lazarus iniciando com sujeira de memoria vStrings
46994702
vStrings := nil;
4700-
47014703
If ServerMethodsClass <> Nil Then
47024704
Begin
47034705
For I := 0 To ServerMethodsClass.ComponentCount -1 Do
@@ -5973,7 +5975,8 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
59735975
baseEventUnit,
59745976
vUrlToExec,
59755977
aurlContext : String;
5976-
Var vRequestHeader : TStringList);
5978+
Var vRequestHeader : TStringList;
5979+
Var vdwConnectionDefs : TConnectionDefs);
59775980
Var
59785981
I : Integer;
59795982
mb : TStringStream;
@@ -5994,7 +5997,6 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
59945997
decoder : TRESTDWMessageDecoderMIME;
59955998
ms : TStream;
59965999
vDecoderHeaderList : TStringList;
5997-
vdwConnectionDefs : TConnectionDefs;
59986000
JSONValue : TRESTDWJSONValue;
59996001
Begin
60006002
vDecoderHeaderList := Nil;
@@ -6446,20 +6448,16 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
64466448
vUrlToExec := aurlContext;
64476449
End;
64486450
Finally
6449-
// If Assigned(DWParams) Then
6450-
// FreeAndNil(DWParams);
64516451
If Assigned(mb) Then
64526452
FreeAndNil(mb);
6453-
// If Assigned(JSONParam) Then
6454-
// FreeAndNil(JSONParam);
64556453
If Assigned(newdecoder) Then
64566454
FreeAndNil(newdecoder);
64576455
If Assigned(decoder) Then
64586456
FreeAndNil(decoder);
64596457
If Assigned(vDecoderHeaderList) Then
64606458
FreeAndNil(vDecoderHeaderList);
6461-
If Assigned(vdwConnectionDefs) Then
6462-
FreeAndNil(vdwConnectionDefs);
6459+
// If Assigned(vdwConnectionDefs) Then
6460+
// FreeAndNil(vdwConnectionDefs);
64636461
If Assigned(JSONValue) Then
64646462
FreeAndNil(JSONValue);
64656463
End;

‎CORE/Source/Basic/uRESTDWParams.pas‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4899,6 +4899,10 @@ procedure TRESTDWJSONParam.SetParamContentType(const bValue: String);
48994899
vStringStream : TStream;
49004900
{$IFDEF RESTDWLAZARUS}
49014901
vFileStream : TFileStream;
4902+
{$ELSE}
4903+
{$IF CompilerVersion < 21}
4904+
vFileStream : TFileStream;
4905+
{$IFEND}
49024906
{$ENDIF}
49034907
Begin
49044908
vStringStream := Nil;

‎CORE/Source/Basic/uRESTDWPoolermethod.pas‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,6 +2491,14 @@ implementation
24912491
JSONParam.ObjectDirection := odIn;
24922492
JSONParam.AsBoolean := Metadata;
24932493
DWParams.Add(JSONParam);
2494+
If Assigned(ConnectionDefs) Then
2495+
Begin
2496+
JSONParam := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
2497+
JSONParam.ParamName := 'dwConnectionDefs';
2498+
JSONParam.ObjectDirection := odIn;
2499+
JSONParam.AsString := TConnectionDefs(ConnectionDefs).ToJSON;
2500+
DWParams.Add(JSONParam);
2501+
End;
24942502
JSONParam := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
24952503
JSONParam.ParamName := 'Result';
24962504
JSONParam.ObjectDirection := odOUT;
@@ -2507,14 +2515,6 @@ implementation
25072515
JSONParam.ObjectDirection := odOUT;
25082516
JSONParam.ObjectValue := ovInteger;
25092517
DWParams.Add(JSONParam);
2510-
If Assigned(ConnectionDefs) Then
2511-
Begin
2512-
JSONParam := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
2513-
JSONParam.ParamName := 'dwConnectionDefs';
2514-
JSONParam.ObjectDirection := odIn;
2515-
JSONParam.AsString := TConnectionDefs(ConnectionDefs).ToJSON;
2516-
DWParams.Add(JSONParam);
2517-
End;
25182518
Try
25192519
Try
25202520
RESTClientPoolerExec.BinaryRequest := vBinaryRequest;

‎CORE/Source/Basic/uRESTDWServerMethodClass.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit uRESTDWServerMethodClass;
1+
unit uRESTDWServerMethodClass;
22

33
{$I ..\Includes\uRESTDW.inc}
44

‎CORE/Source/Plugins/DMDados/uRESTDWDatamodule.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit uRESTDWDatamodule;
1+
unit uRESTDWDatamodule;
22

33
{$I ..\..\Includes\uRESTDW.inc}
44

0 commit comments

Comments
 (0)