Changeset 15 for trunk/Packages/Common/UXMLUtils.pas

Timestamp:

Mar 22, 2018, 8:31:19 PM (6 years ago)

Author:

chronos

Message:

• Modified: Update Common and CollTranslator packages to fix build under Lazarus 1.8.
• Fixed: Some memory leaks.

File:

• trunk/Packages/Common/UXMLUtils.pas (modified) (7 diffs)

trunk/Packages/Common/UXMLUtils.pas

@@ -12 +12 @@
 function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
 procedure WriteInteger(Node: TDOMNode; Name: string; Value: Integer);
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 procedure WriteString(Node: TDOMNode; Name: string; Value: string);
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
 
 
@@ -72 +76 @@
   Minute: Integer;
   Second: Integer;
+  SecondFraction: Double;
   Millisecond: Integer;
 begin
@@ -94 +99 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      Millisecond := StrToInt(Part);
+      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
+      Millisecond := Trunc(SecondFraction * 1000);
     end else begin
       if Pos('+', XMLDateTime) > 0 then
@@ -138 +144 @@
 end;
 
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := IntToStr(Value);
+  Node.AppendChild(NewNode);
+end;
+
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 var
@@ -156 +171 @@
 end;
 
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := DateTimeToXMLTime(Value);
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var
@@ -166 +190 @@
 end;
 
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := StrToInt64(NewNode.TextContent);
+end;
+
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 var
@@ -186 +220 @@
 end;
 
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime
+  ): TDateTime;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := XMLTimeToDateTime(NewNode.TextContent);
+end;
+
 end.