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

* Added jsoCheckEmptyDateTime option to check for 0 date/time

Browse Source 
git-svn-id: trunk@21628 -
This commit is contained in:
michael 2012-06-17 08:26:34 +00:00
parent 872409d293
commit 7718db9b5e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-json/src/fpjsonrtti.pp
View File

@ -20,8 +20,9 @@ Type
jsoComponentsInline, // Always stream components inline. Default is to stream name, unless csSubcomponent in ComponentStyle jsoComponentsInline, // Always stream components inline. Default is to stream name, unless csSubcomponent in ComponentStyle
jsoTStringsAsArray, // Stream TStrings as an array of strings. Associated objects are not streamed. jsoTStringsAsArray, // Stream TStrings as an array of strings. Associated objects are not streamed.
jsoTStringsAsObject, // Stream TStrings as an object : string = { object } jsoTStringsAsObject, // Stream TStrings as an object : string = { object }
jsoDateTimeAsString, jsoDateTimeAsString, // Format a TDateTime value as a string
jsoUseFormatString); // Use FormatString when creating JSON strings. jsoUseFormatString, // Use FormatString when creating JSON strings.
jsoCheckEmptyDateTime); // If TDateTime value is empty and jsoDateTimeAsString is used, 0 date returns empty string
TJSONStreamOptions = Set of TJSONStreamOption; TJSONStreamOptions = Set of TJSONStreamOption;
TJSONFiler = Class(TComponent) TJSONFiler = Class(TComponent)
@ -999,7 +1000,9 @@ Var
S: String; S: String;
begin begin
if (DateTimeFormat<>'') then if (jsoCheckEmptyDateTime in Options) and (DateTime=0) then
S:=''
else if (DateTimeFormat<>'') then
S:=FormatDateTime(DateTimeFormat,DateTime) S:=FormatDateTime(DateTimeFormat,DateTime)
else if Frac(DateTime)=0 then else if Frac(DateTime)=0 then
S:=DateToStr(DateTime) S:=DateToStr(DateTime)