Changeset 4 for trunk/UDatabaseXML.pas

Timestamp:

Jan 18, 2015, 11:29:26 PM (9 years ago)

Author:

chronos

Message:

• Moved: Field and value data type declaration moved to separate unit.
• Modified: Fields edit form is now modal and made need changes need to be accepted.
• Added: 32x32 icons to actions.
• Fixed: If fileds count or type changed then table values are updated.

File:

• trunk/UDatabaseXML.pas (modified) (5 diffs)

trunk/UDatabaseXML.pas

@@ -37 +37 @@
 implementation
 
+uses
+  UDataTypes;
+
 resourcestring
   SWrongFileFormat = 'Wrong file format';
@@ -52 +55 @@
 var
   Node2: TDOMNode;
-  NewValue: TValue;
-  I: Integer;
-begin
-  Row.Values.Count := 0;
+  I: Integer;
+begin
+  Row.Values.Count := Row.Parent.Fields.Count;
+  for I := 0 to Row.Values.Count - 1 do
+    Row.Values[I] := TValueClass(TField(Row.Parent.Fields[I]).GetValueClass).Create;
+
   Node2 := Node.FirstChild;
   I := 0;
-  while Assigned(Node2) and (Node2.NodeName = 'Value') do begin
-    if TField(Row.Parent.Fields[I]).FieldType = ftString then begin
-      NewValue := TValueString.Create;
-      TValueString(NewValue).Value := Node2.TextContent;
-    end else
-    if TField(Row.Parent.Fields[I]).FieldType = ftDateTime then begin
-      NewValue := TValueDateTime.Create;
-      if Node2.TextContent <> '' then
-        TValueDateTime(NewValue).Value := XMLTimeToDateTime(Node2.TextContent);
-    end else NewValue := TValue.Create;
-    Row.Values.Add(NewValue);
+  while Assigned(Node2) and (Node2.NodeName = 'Value') and (I < Row.Values.Count) do begin
+    case TField(Row.Parent.Fields[I]).FieldType of
+      ftString: TValueString(Row.Values[I]).Value := Node2.TextContent;
+      ftInteger: TValueInteger(Row.Values[I]).Value := StrToInt(Node2.TextContent);
+      ftDateTime: if Node2.TextContent <> '' then
+        TValueDateTime(Row.Values[I]).Value := XMLTimeToDateTime(Node2.TextContent);
+      ftBoolean: TValueBoolean(Row.Values[I]).Value := StrToBool(Node2.TextContent);
+    end;
     Node2 := Node2.NextSibling;
     Inc(I);
@@ -82 +84 @@
     NewNode := Node.OwnerDocument.CreateElement('Value');
     Node.AppendChild(NewNode);
-    if TField(Row.Parent.Fields[I]).FieldType = ftString then
-      NewNode.TextContent := TValueString(Row.Values[I]).Value;
-    if TField(Row.Parent.Fields[I]).FieldType = ftDateTime then
-      NewNode.TextContent := DateTimeToXMLTime(TValueDateTime(Row.Values[I]).Value);
+    case TField(Row.Parent.Fields[I]).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);
+    end;
   end;
 end;
@@ -165 +170 @@
 begin
   Table.Name := ReadString(Node, 'Name', '');
+  Table.Caption := ReadString(Node, 'Caption', '');
 
   NewNode := Node.FindNode('Fields');
@@ -180 +186 @@
 begin
   WriteString(Node, 'Name', Table.Name);
+  WriteString(Node, 'Caption', Table.Caption);
 
   NewNode := Node.OwnerDocument.CreateElement('Fields');