You've already forked lazarus-ccr
TDurationRemotable and TTimeRemotable implementation + tests
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@896 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
@@ -24,23 +24,64 @@ type
|
||||
MinuteOffset : Shortint;
|
||||
end;
|
||||
|
||||
TTimeRec = packed record
|
||||
Hour : Byte;
|
||||
Minute : Byte;
|
||||
Second : Byte;
|
||||
MilliSecond : Word;
|
||||
HourOffset : Shortint;
|
||||
MinuteOffset : Shortint;
|
||||
end;
|
||||
|
||||
const
|
||||
ZERO_DATE : TDateTimeRec = ( Date : 0; HourOffset : 0; MinuteOffset : 0; );
|
||||
ZERO_TIME : TTimeRec = (
|
||||
Hour : 0;
|
||||
Minute : 0;
|
||||
Second : 0;
|
||||
MilliSecond : 0;
|
||||
HourOffset : 0;
|
||||
MinuteOffset : 0;
|
||||
);
|
||||
|
||||
function xsd_TryStrToDate(const AStr : string; out ADate : TDateTimeRec) : Boolean;
|
||||
function xsd_StrToDate(const AStr : string) : TDateTimeRec;
|
||||
function xsd_StrToDate(const AStr : string) : TDateTimeRec; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
|
||||
function xsd_DateTimeToStr(const ADate : TDateTimeRec) : string;overload;
|
||||
function xsd_DateTimeToStr(const ADate : TDateTime) : string;overload;
|
||||
|
||||
function xsd_TimeToStr(const ATime : TTimeRec) : string;
|
||||
function xsd_TryStrToTime(const AStr : string; out ADate : TTimeRec) : Boolean;
|
||||
function xsd_StrToTime(const AStr : string) : TTimeRec; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
function xsd_EncodeTime(
|
||||
const AHour,
|
||||
AMin,
|
||||
ASec : Byte;
|
||||
const AMiliSec : Word
|
||||
) : TTimeRec; overload; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
function xsd_EncodeTime(
|
||||
const AHour,
|
||||
AMin,
|
||||
ASec : Byte;
|
||||
const AMiliSec : Word;
|
||||
const AHourOffset : Shortint;
|
||||
const AMinuteOffset : Shortint
|
||||
) : TTimeRec; overload; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
function DateTimeToTimeRec(const ADateTime : TDateTime) : TTimeRec; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
function TimeRecToDateTime(const ATime : TTimeRec) : TDateTime; {$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
|
||||
|
||||
function IncHour(const AValue: TDateTime; const ANumberOfHours: Int64): TDateTime;{$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
function IncMinute(const AValue: TDateTime; const ANumberOfMinutes: Int64): TDateTime;{$IFDEF USE_INLINE}inline;{$ENDIF}
|
||||
|
||||
function NormalizeToUTC(const ADate : TDateTimeRec) : TDateTime;
|
||||
function DateEquals(const AA,AB: TDateTimeRec) : Boolean;
|
||||
function NormalizeToUTC(const ADate : TDateTimeRec) : TDateTime; overload;
|
||||
function NormalizeToUTC(const ATime : TTimeRec) : TTimeRec; overload;
|
||||
function Equals(const AA,AB: TDateTimeRec) : Boolean; overload;
|
||||
function Equals(const AA,AB: TTimeRec) : Boolean; overload;
|
||||
|
||||
resourcestring
|
||||
SERR_InvalidDate = '"%s" is not a valid date.';
|
||||
SERR_InvalidTime = '"%s" is not a valid time.';
|
||||
|
||||
implementation
|
||||
|
||||
@@ -65,8 +106,27 @@ begin
|
||||
Result := IncMinute(Result,-ADate.MinuteOffset);
|
||||
end;
|
||||
|
||||
function NormalizeToUTC(const ATime : TTimeRec) : TTimeRec;
|
||||
var
|
||||
locDate : TDateTime;
|
||||
e_h, e_mn, e_ss, e_ms : Word;
|
||||
begin
|
||||
locDate := TimeRecToDateTime(ATime);
|
||||
if ( ATime.HourOffset <> 0 ) then
|
||||
locDate := IncHour(locDate,ATime.HourOffset);
|
||||
if ( ATime.MinuteOffset <> 0 ) then
|
||||
locDate := IncMinute(locDate,ATime.MinuteOffset);
|
||||
DecodeTime(locDate,e_h,e_mn,e_ss,e_ms);
|
||||
Result.Hour := e_h;
|
||||
Result.Minute := e_mn;
|
||||
Result.Second := e_ss;
|
||||
Result.MilliSecond := e_ms;
|
||||
Result.HourOffset := 0;
|
||||
Result.MinuteOffset := 0;
|
||||
end;
|
||||
|
||||
{$HINTS OFF}
|
||||
function DateEquals(const AA,AB: TDateTimeRec) : Boolean;
|
||||
function Equals(const AA,AB: TDateTimeRec) : Boolean;
|
||||
var
|
||||
e, a : TDateTime;
|
||||
e_y, e_m, e_d, e_h, e_mn, e_ss, e_ms : Word;
|
||||
@@ -81,6 +141,20 @@ begin
|
||||
end;
|
||||
{$HINTS ON}
|
||||
|
||||
function Equals(const AA,AB: TTimeRec) : Boolean;
|
||||
var
|
||||
a, b : TTimeRec;
|
||||
begin
|
||||
a := NormalizeToUTC(AA);
|
||||
b := NormalizeToUTC(AB);
|
||||
Result := ( a.Hour = b.Hour ) and
|
||||
( a.Minute = b.Minute ) and
|
||||
( a.Second = b.Second ) and
|
||||
( a.MilliSecond = b.MilliSecond ) and
|
||||
( a.HourOffset = b.HourOffset ) and
|
||||
( a.MinuteOffset = b.MinuteOffset );
|
||||
end;
|
||||
|
||||
function xsd_TryStrToDate(const AStr : string; out ADate : TDateTimeRec) : Boolean;
|
||||
const
|
||||
DATE_SEP_CHAR = '-'; TIME_MARKER_CHAR = 'T'; TIME_SEP_CHAR = ':';
|
||||
@@ -225,7 +299,6 @@ end;
|
||||
function xsd_DateTimeToStr(const ADate : TDateTimeRec) : string;
|
||||
var
|
||||
locDate : TDateTime;
|
||||
s, buffer : string;
|
||||
d, m, y : Word;
|
||||
hh, mn, ss, ssss : Word;
|
||||
begin
|
||||
@@ -235,46 +308,11 @@ begin
|
||||
locDate := IncHour(locDate,-ADate.HourOffset);
|
||||
if ( ADate.MinuteOffset <> 0 ) then
|
||||
locDate := IncMinute(locDate,-ADate.MinuteOffset);
|
||||
DecodeDate(locDate,y,m,d);
|
||||
s := IntToStr(y);
|
||||
buffer := IntToStr(m);
|
||||
if ( Length(s) < 4 ) then
|
||||
s := StringOfChar('0', ( 4 - Length(s) ) ) + s;
|
||||
if ( m < 10 ) then
|
||||
buffer := '0' + buffer;
|
||||
s := Format('%s-%s',[s,buffer]);
|
||||
|
||||
buffer := IntToStr(d);
|
||||
if ( d < 10 ) then
|
||||
buffer := '0' + buffer;
|
||||
s := Format('%s-%s',[s,buffer]);
|
||||
|
||||
DecodeTime(locDate,hh,mn,ss,ssss);
|
||||
buffer := IntToStr(hh);
|
||||
if ( hh < 10 ) then
|
||||
buffer := '0' + buffer;
|
||||
s := Format('%sT%s',[s,buffer]);
|
||||
|
||||
buffer := IntToStr(mn);
|
||||
if ( mn < 10 ) then
|
||||
buffer := '0' + buffer;
|
||||
s := Format('%s:%s',[s,buffer]);
|
||||
|
||||
buffer := IntToStr(ss);
|
||||
if ( ss < 10 ) then
|
||||
buffer := '0' + buffer;
|
||||
s := Format('%s:%s',[s,buffer]);
|
||||
|
||||
if ( ssss > 0 ) then begin
|
||||
buffer := IntToStr(ssss);
|
||||
case ssss of
|
||||
0..9 : buffer := '00' + buffer;
|
||||
10..99 : buffer := '0' + buffer;
|
||||
end;
|
||||
s := Format('%s.%s',[s,buffer]);
|
||||
end;
|
||||
|
||||
Result := s + 'Z';
|
||||
DecodeDateTime(locDate,y,m,d,hh,mn,ss,ssss);
|
||||
if ( ssss = 0 ) then
|
||||
Result := Format('%.4d-%.2d-%.2dT%.2d:%.2d:%.2dZ',[y,m,d, hh,mn,ss])
|
||||
else
|
||||
Result := Format('%.4d-%.2d-%.2dT%.2d:%.2d:%.2d.%.3dZ',[y,m,d, hh,mn,ss,ssss]);
|
||||
end;
|
||||
|
||||
function xsd_DateTimeToStr(const ADate : TDateTime) : string;
|
||||
@@ -286,4 +324,203 @@ begin
|
||||
Result := xsd_DateTimeToStr(tmpDate);
|
||||
end;
|
||||
|
||||
function xsd_TimeToStr(const ATime : TTimeRec) : string;
|
||||
var
|
||||
buffer : string;
|
||||
begin
|
||||
//hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
|
||||
if ( ( ATime.Hour < 0 ) or ( ATime.Hour > 23 ) ) or
|
||||
( ( ATime.Minute < 0 ) or ( ATime.Minute > 59 ) ) or
|
||||
( ( ATime.Second < 0 ) or ( ATime.Second > 59 ) ) or
|
||||
( ATime.MilliSecond < 0 )
|
||||
then begin
|
||||
buffer := Format('{ Hour : %d; Minute : %d; Second : %d; SecondFractional : %d}',[ATime.Hour,ATime.Minute,ATime.Second,ATime.MilliSecond]);
|
||||
raise EConvertError.CreateFmt(SERR_InvalidTime,[buffer]);
|
||||
end;
|
||||
if ( ATime.MilliSecond = 0 ) then
|
||||
buffer := Format('%.2d:%.2d:%.2d',[ATime.Hour,ATime.Minute,ATime.Second])
|
||||
else
|
||||
buffer := Format('%.2d:%.2d:%.2d.%.3d',[ATime.Hour,ATime.Minute,ATime.Second,ATime.MilliSecond]);
|
||||
if ( ATime.HourOffset <> 0 ) then begin
|
||||
if ( ATime.HourOffset > 0 ) then
|
||||
buffer := Format('%s+%.2d',[buffer,ATime.HourOffset])
|
||||
else
|
||||
buffer := Format('%s-%.2d',[buffer,-ATime.HourOffset]);
|
||||
if ( ATime.MinuteOffset > 0 ) then
|
||||
buffer := Format('%s:%.2d',[buffer,ATime.MinuteOffset])
|
||||
else if ( ATime.MinuteOffset < 0 ) then
|
||||
buffer := Format('%s:%.2d',[buffer,-ATime.MinuteOffset]);
|
||||
end else if ( ATime.MinuteOffset <> 0 ) then begin
|
||||
if ( ATime.MinuteOffset > 0 ) then
|
||||
buffer := Format('%s+00:%.2d',[buffer,ATime.MinuteOffset])
|
||||
else if ( ATime.MinuteOffset < 0 ) then
|
||||
buffer := Format('%s-00:%.2d',[buffer,-ATime.MinuteOffset]);
|
||||
end;
|
||||
if ( ATime.HourOffset = 0 ) and ( ATime.MinuteOffset = 0 ) then
|
||||
buffer := buffer + 'Z';
|
||||
Result := buffer;
|
||||
end;
|
||||
|
||||
function xsd_TryStrToTime(const AStr : string; out ADate : TTimeRec) : Boolean;
|
||||
const
|
||||
TIME_SEP_CHAR = ':';
|
||||
var
|
||||
buffer : string;
|
||||
bufferPos, bufferLen : Integer;
|
||||
|
||||
function ReadInt(out AValue : Integer; const ASeparatorAtEnd : Char) : Boolean;
|
||||
var
|
||||
locStartPos : Integer;
|
||||
begin
|
||||
while ( bufferPos <= bufferLen ) and ( buffer[bufferPos] < #33 ) do begin
|
||||
Inc(bufferPos);
|
||||
end;
|
||||
locStartPos := bufferPos;
|
||||
if ( bufferPos <= bufferLen ) and ( buffer[bufferPos] in ['-','+'] ) then
|
||||
Inc(bufferPos);
|
||||
while ( bufferPos <= bufferLen ) and ( buffer[bufferPos] in ['0'..'9'] ) do begin
|
||||
Inc(bufferPos);
|
||||
end;
|
||||
Result := ( bufferPos > locStartPos ) and
|
||||
( ( ASeparatorAtEnd = #0 ) or
|
||||
( ( bufferPos <= bufferLen ) and
|
||||
( buffer[bufferPos] = ASeparatorAtEnd )
|
||||
)
|
||||
);
|
||||
if Result then
|
||||
Result := TryStrToInt(Copy(buffer,locStartPos,(bufferPos-locStartPos)),AValue);
|
||||
end;
|
||||
|
||||
var
|
||||
hh, mn, ss, ssss : Integer;
|
||||
tz_hh, tz_mn : Integer;
|
||||
tz_negative : Boolean;
|
||||
ok : Boolean;
|
||||
begin
|
||||
//hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
|
||||
buffer := Trim(AStr);
|
||||
bufferPos := 1;
|
||||
bufferLen := Length(buffer);
|
||||
ok := False;
|
||||
if ( bufferLen > 0 ) then begin
|
||||
if ReadInt(hh,#0) then begin
|
||||
Inc(bufferPos);
|
||||
mn := 0;
|
||||
ss := 0;
|
||||
ssss := 0;
|
||||
tz_hh := 0;
|
||||
tz_mn := 0;
|
||||
ok := True;
|
||||
if ( bufferPos < bufferLen ) then begin
|
||||
ok := ( buffer[bufferPos -1] = TIME_SEP_CHAR ) and ReadInt(mn,#0);
|
||||
if ok then begin
|
||||
Inc(bufferPos);
|
||||
if ( bufferPos < bufferLen ) then begin
|
||||
ok := ReadInt(ss,#0);
|
||||
if ok then begin
|
||||
if ( bufferPos < bufferLen ) then begin
|
||||
if ( buffer[bufferPos] = '.' ) then begin
|
||||
Inc(bufferPos);
|
||||
ok := ReadInt(ssss,#0);
|
||||
end else begin
|
||||
ssss := 0;
|
||||
end;
|
||||
if ok and ( bufferPos < bufferLen ) then begin
|
||||
ok := ( buffer[bufferPos] in ['+','-'] );
|
||||
if ok then begin
|
||||
tz_negative := ( buffer[bufferPos] = '-' );
|
||||
Inc(bufferPos);
|
||||
ok := ReadInt(tz_hh,#0);
|
||||
if ok then begin
|
||||
Inc(bufferPos);
|
||||
if ( bufferPos < bufferLen ) then
|
||||
ok := ReadInt(tz_mn,#0)
|
||||
else
|
||||
tz_mn := 0;
|
||||
if ok and tz_negative then begin
|
||||
tz_hh := -tz_hh;
|
||||
tz_mn := -tz_mn;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
if ok then begin
|
||||
ok := ( ( hh = 24 ) and ( mn = 0 ) and ( ss = 0 ) and ( ssss = 0 )
|
||||
) or
|
||||
( ( hh >= 0 ) and ( hh < 24 ) and
|
||||
( mn >= 0 ) and ( mn < 60 ) and
|
||||
( ss >= 0 ) and ( ss < 60 ) and
|
||||
( ssss >= 0 ) and ( ssss < 1000 )
|
||||
);
|
||||
ok := ok and
|
||||
( tz_hh > -60 ) and ( tz_hh < 60 ) and
|
||||
( tz_mn > -60 ) and ( tz_mn < 60 );
|
||||
end;
|
||||
if ok then begin
|
||||
ADate.Hour := hh;
|
||||
ADate.Minute := mn;
|
||||
ADate.Second := ss;
|
||||
ADate.MilliSecond := ssss;
|
||||
ADate.HourOffset := tz_hh;
|
||||
ADate.MinuteOffset := tz_mn;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
Result := ok;
|
||||
end;
|
||||
|
||||
function xsd_StrToTime(const AStr : string) : TTimeRec;
|
||||
begin
|
||||
if not xsd_TryStrToTime(AStr,Result) then
|
||||
raise EConvertError.CreateFmt(SERR_InvalidTime,[AStr]);
|
||||
end;
|
||||
|
||||
function xsd_EncodeTime(
|
||||
const AHour,
|
||||
AMin,
|
||||
ASec : Byte;
|
||||
const AMiliSec : Word
|
||||
) : TTimeRec;
|
||||
begin
|
||||
Result := xsd_EncodeTime(AHour,AMin,ASec,AMiliSec,0,0);
|
||||
end;
|
||||
|
||||
function xsd_EncodeTime(
|
||||
const AHour,
|
||||
AMin,
|
||||
ASec : Byte;
|
||||
const AMiliSec : Word;
|
||||
const AHourOffset : Shortint;
|
||||
const AMinuteOffset : Shortint
|
||||
) : TTimeRec;
|
||||
begin
|
||||
Result.Hour := AHour;
|
||||
Result.Minute := AMin;
|
||||
Result.Second := ASec;
|
||||
Result.MilliSecond := AMiliSec;
|
||||
Result.HourOffset := AHourOffset;
|
||||
Result.MinuteOffset := AMinuteOffset;
|
||||
end;
|
||||
|
||||
function DateTimeToTimeRec(const ADateTime : TDateTime) : TTimeRec;
|
||||
var
|
||||
hh, mn, ss, ssss : Word;
|
||||
begin
|
||||
DecodeTime(ADateTime,hh,mn,ss,ssss);
|
||||
Result.Hour := hh;
|
||||
Result.Minute := mn;
|
||||
Result.Second := ss;
|
||||
Result.MilliSecond := ssss;
|
||||
end;
|
||||
|
||||
function TimeRecToDateTime(const ATime : TTimeRec) : TDateTime;
|
||||
begin
|
||||
Result := EncodeTime(ATime.Hour,ATime.Minute,ATime.Second,ATime.MilliSecond);
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
Reference in New Issue
Block a user