Removed synapse (support)
This commit is contained in:
@@ -22,13 +22,9 @@ program restemplate;
|
||||
{$mode objfpc}
|
||||
{$modeswitch advancedrecords}
|
||||
|
||||
{.$define use_synapse}
|
||||
{$define use_fclweb}
|
||||
|
||||
uses
|
||||
SysUtils, Classes, strutils, IniFiles, fgl,
|
||||
{$ifdef use_synapse}httpsend, ssl_openssl,{$endif}
|
||||
{$ifdef use_fclweb}fphttpclient,{$endif}
|
||||
fphttpclient,
|
||||
JTemplate,
|
||||
fpjson, jsonparser,
|
||||
DOM, XMLRead, XMLWrite,
|
||||
@@ -66,8 +62,7 @@ var
|
||||
data: TextFile;
|
||||
line: String;
|
||||
parser: TJTemplateParser;
|
||||
{$ifdef use_synapse}http: THTTPSend;{$endif}
|
||||
{$ifdef use_fclweb}http: TFPHTTPClient;{$endif}
|
||||
http: TFPHTTPClient;
|
||||
method, url: String;
|
||||
content: TStringList;
|
||||
commandMode: Boolean;
|
||||
@@ -143,11 +138,6 @@ begin
|
||||
parser.Replace;
|
||||
AHeader := parser.Content;
|
||||
|
||||
{$ifdef use_synapse}
|
||||
http.Headers.Add(AHeader);
|
||||
{$endif}
|
||||
|
||||
{$ifdef use_fclweb}
|
||||
i := 1;
|
||||
while (i < Length(AHeader)) and (AHeader[i] <> ':') do
|
||||
Inc(i);
|
||||
@@ -156,7 +146,6 @@ begin
|
||||
value := Trim(Copy(AHeader, i + 1, Length(AHeader)));
|
||||
|
||||
http.AddHeader(name, value);
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
function IdentifyContentType(AString: String; out ContentType: TContentType): Boolean;
|
||||
@@ -243,9 +232,7 @@ end;
|
||||
procedure ProcessCall(AURL: String);
|
||||
var
|
||||
s: String;
|
||||
{$ifdef use_fclweb}
|
||||
request, response: TStream;
|
||||
{$endif}
|
||||
jsonParser: TJSONParser;
|
||||
jsonData: TJSONData;
|
||||
contentType: TContentType;
|
||||
@@ -256,37 +243,6 @@ begin
|
||||
AURL := parser.Content;
|
||||
writeln('Calling ', AURL);
|
||||
|
||||
{$ifdef use_synapse}
|
||||
if content.Count > 0 then
|
||||
begin
|
||||
// Variable replacement
|
||||
parser.Content := content.Text;
|
||||
parser.Replace;
|
||||
content.Text .= parser.Content;
|
||||
|
||||
content.SaveToStream(http.Document);
|
||||
end;
|
||||
|
||||
if http.HTTPMethod(method, AURL) then
|
||||
begin
|
||||
writeln;
|
||||
writeln('Status: ', http.ResultCode);
|
||||
writeln;
|
||||
writeln('Headers:');
|
||||
for s in http.Headers do
|
||||
writeln(' ', s);
|
||||
writeln;
|
||||
content.LoadFromStream(http.Document);
|
||||
writeln(content.Text);
|
||||
end else
|
||||
begin
|
||||
ExitCode := 2;
|
||||
writeln;
|
||||
writeln('FAILED! Last Socket Error: ', http.Sock.SocksLastError);
|
||||
end;
|
||||
{$endif}
|
||||
|
||||
{$ifdef use_fclweb}
|
||||
response := TMemoryStream.Create;
|
||||
request := nil;
|
||||
|
||||
@@ -355,7 +311,6 @@ begin
|
||||
|
||||
response.Free;
|
||||
request.Free;
|
||||
{$endif}
|
||||
end;
|
||||
|
||||
procedure CmdBasicAuth(AData: String);
|
||||
@@ -475,13 +430,7 @@ begin
|
||||
THighlightFilter.FilterExpression := TRegExpr.Create('( (FG|BG)(\d+))*$');
|
||||
THighlightFilter.ParamExpression := TRegExpr.Create('(FG|BG)(\d+)');
|
||||
|
||||
{$ifdef use_synapse}
|
||||
http := THTTPSend.Create;
|
||||
{$endif}
|
||||
|
||||
{$ifdef use_fclweb}
|
||||
http := TFPHttpClient.Create(nil);
|
||||
{$endif}
|
||||
|
||||
commandMode := True;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user