Changeset 476

Timestamp:

Jul 13, 2015, 11:54:55 AM (9 years ago)

Author:

chronos

Message:

• Fixed second fraction read from XML date time.

Location:

Common

Files:

• UCommon.pas (modified) (2 diffs)
• UXMLUtils.pas (modified) (5 diffs)

Common/UCommon.pas

@@ -64 +64 @@
 procedure ExecuteProgram(CommandLine: string);
 procedure FreeThenNil(var Obj);
+function RemoveQuotes(Text: string): string;
 
 
@@ -440 +441 @@
 end;
 
+function RemoveQuotes(Text: string): string;
+begin
+  Result := Text;
+  if (Pos('"', Text) = 1) and (Text[Length(Text)] = '"') then
+    Result := Copy(Text, 2, Length(Text) - 2);
+end;
+
+
 initialization
 

Common/UXMLUtils.pas

@@ -14 +14 @@
 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 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 +74 @@
   Minute: Integer;
   Second: Integer;
+  SecondFraction: Double;
   Millisecond: Integer;
 begin
@@ -94 +97 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      Millisecond := StrToInt(Part);
+      SecondFraction := StrToFloat('0.' + Part);
+      Millisecond := Trunc(SecondFraction * 1000);
     end else begin
       if Pos('+', XMLDateTime) > 0 then
@@ -156 +160 @@
 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
@@ -186 +199 @@
 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.