paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-20 23:59:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix issue #38968, patch from Werner Pamler to fix fractional seconds in IS8061conversion

Browse Source 
git-svn-id: trunk@49484 -
This commit is contained in:
michael 2021-06-06 12:47:49 +00:00
parent 40e1a09e6c
commit aedd0e4518
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/rtl-objpas/src/inc/dateutil.inc
View File

@ -2769,7 +2769,9 @@ end;
function TryISOStrToTime(const aString: string; Out outTime: TDateTime): Boolean;
var
xHour, xMinute, xSecond, xMillisecond, xLength: LongInt;
xHour, xMinute, xSecond, xLength, res: LongInt;
xFractionalSecond: Extended;
tmp: String;
begin
Result := True;
xLength := Length(aString);
@ -2829,24 +2831,31 @@ begin
(aString[6] = ':') and
TryStrToInt(Copy(aString, 7, 2), xSecond) and
TryEncodeTime(xHour, xMinute, xSecond, 0, outTime);
10: Result :=
TryStrToInt(Copy(aString, 1, 2), xHour) and
TryStrToInt(Copy(aString, 3, 2), xMinute) and
TryStrToInt(Copy(aString, 5, 2), xSecond) and
(aString[7] = '.') and
TryStrToInt(Copy(aString, 8, 3), xMillisecond) and
TryEncodeTime(xHour, xMinute, xSecond, xMillisecond, outTime);
12: Result :=
TryStrToInt(Copy(aString, 1, 2), xHour) and
(aString[3] = ':') and
TryStrToInt(Copy(aString, 4, 2), xMinute) and
(aString[6] = ':') and
TryStrToInt(Copy(aString, 7, 2), xSecond) and
(aString[9] = '.') and
TryStrToInt(Copy(aString, 10, 3), xMillisecond) and
TryEncodeTime(xHour, xMinute, xSecond, xMillisecond, outTime);
else
Result := False;
else
if xLength >= 9 then
begin
Result :=
TryStrToInt(Copy(aString, 1, 2), xHour) and
(aString[3] = ':') and
TryStrToInt(Copy(aString, 4, 2), xMinute) and
(aString[6] = ':') and
TryStrToInt(Copy(aString, 7, 2), xSecond) and
((aString[9] = '.') or (aString[9] = ',')) and
TryEncodeTime(xHour, xMinute, xSecond, 0, outTime);
if Result then
begin
tmp := Copy(aString, 9, xLength-8);
if tmp <> '' then
begin
tmp[1] := '.';
val(tmp, xFractionalSecond, res);
Result := res = 0;
if Result then
outTime := outTime + xFractionalSecond * OneSecond;
end;
end;
end else
Result := false;
end;
if not Result then