Changeset 15 for trunk/DbEngines/UEngineXML.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/DbEngines/UEngineXML.pas (modified) (4 diffs)

trunk/DbEngines/UEngineXML.pas

@@ -77 +77 @@
   while Assigned(Node2) and (Node2.NodeName = 'Value') and (I < Row.Values.Count) do begin
     case TField(Row.Parent.Fields[I]).DataType.FieldType of
-      ftString: TValueString(Row.Values[I]).Value := Node2.TextContent;
-      ftInteger: TValueInteger(Row.Values[I]).Value := StrToInt(Node2.TextContent);
+      ftString: TValueString(Row.Values[I]).Value := string(Node2.TextContent);
+      ftInteger: TValueInteger(Row.Values[I]).Value := StrToInt(string(Node2.TextContent));
       ftDateTime: if Node2.TextContent <> '' then
-        TValueDateTime(Row.Values[I]).Value := XMLTimeToDateTime(Node2.TextContent);
-      ftBoolean: TValueBoolean(Row.Values[I]).Value := StrToBool(Node2.TextContent);
+        TValueDateTime(Row.Values[I]).Value := XMLTimeToDateTime(string(Node2.TextContent));
+      ftBoolean: TValueBoolean(Row.Values[I]).Value := StrToBool(string(Node2.TextContent));
     end;
     Node2 := Node2.NextSibling;
@@ -97 +97 @@
     Node.AppendChild(NewNode);
     case TField(Row.Parent.Fields[I]).DataType.FieldType of
-      ftString: NewNode.TextContent := TValueString(Row.Values[I]).Value;
-      ftInteger: NewNode.TextContent := IntToStr(TValueInteger(Row.Values[I]).Value);
-      ftDateTime: NewNode.TextContent := DateTimeToXMLTime(TValueDateTime(Row.Values[I]).Value);
-      ftBoolean: NewNode.TextContent := BoolToStr(TValueBoolean(Row.Values[I]).Value);
-      ftFloat: NewNode.TextContent := FloatToStr(TValueFloat(Row.Values[I]).Value);
+      ftString: NewNode.TextContent := UnicodeString(TValueString(Row.Values[I]).Value);
+      ftInteger: NewNode.TextContent := UnicodeString(IntToStr(TValueInteger(Row.Values[I]).Value));
+      ftDateTime: NewNode.TextContent := UnicodeString(DateTimeToXMLTime(TValueDateTime(Row.Values[I]).Value));
+      ftBoolean: NewNode.TextContent := UnicodeString(BoolToStr(TValueBoolean(Row.Values[I]).Value));
+      ftFloat: NewNode.TextContent := UnicodeString(FloatToStr(TValueFloat(Row.Values[I]).Value));
     end;
   end;
@@ -244 +244 @@
   NewNode: TDOMNode;
 begin
-  ReadXMLFile(Doc, UTF8Decode(FileName));
+  ReadXMLFile(Doc, FileName);
   with Doc do try
     if Doc.DocumentElement.NodeName <> 'MyData' then
@@ -275 +275 @@
       SaveNodeTables(Database.Tables, NewNode);
     end;
-    ForceDirectoriesUTF8(ExtractFileDir(FileName));
-    WriteXMLFile(Doc, UTF8Decode(FileName));
+    ForceDirectories(ExtractFileDir(FileName));
+    WriteXMLFile(Doc, FileName);
   finally
     Doc.Free;