Changeset 33 for trunk/UAcronym.pas

Timestamp:

Jul 13, 2016, 2:51:53 PM (8 years ago)

Author:

chronos

Message:

• Added: Now import sources have categories which are merged to new imported acronym meanings.

File:

• trunk/UAcronym.pas (modified) (18 diffs)

trunk/UAcronym.pas

@@ -50 +50 @@
 
   TAcronymMeaning = class
+    Id: Integer;
     Name: string;
     Description: string;
@@ -65 +66 @@
 
   TAcronymMeanings = class(TObjectList)
+  public
     Acronym: TAcronym;
+    procedure UpdateIds;
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -87 +90 @@
 
   TAcronymCategories = class(TObjectList)
+    Db: TAcronymDb;
     procedure UpdateIds;
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveRefToNode(Node: TDOMNode);
+    procedure LoadRefFromNode(Node: TDOMNode);
     function SearchByName(Name: string): TAcronymCategory;
     function SearchById(Id: Integer): TAcronymCategory;
@@ -173 +179 @@
     Sources: TImportSources;
     ItemCount: Integer;
+    Categories: TAcronymCategories;
     function DownloadHTTP(URL: string; Stream: TStream): Boolean;
     procedure Process;
@@ -660 +667 @@
                   AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
                   AddedAcronym.Description := NewAcronym.Description;
+                  AddedAcronym.Categories.Assign(Categories, laOr);
                   Inc(ItemCount);
                 end;
@@ -692 +700 @@
   LastTime := Source.LastTime;
   ItemCount := Source.ItemCount;
+  Categories.Assign(Source.Categories);
 end;
 
 procedure TImportSource.SaveToNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
 begin
   WriteString(Node, 'Name', Name);
@@ -701 +712 @@
     else WriteInteger(Node, 'ImportFormat', -1);
   WriteBoolean(Node, 'Enabled', Enabled);
+  WriteInteger(Node, 'ItemCount', ItemCount);
+
+  NewNode := Node.OwnerDocument.CreateElement('Categories');
+  Node.AppendChild(NewNode);
+  Categories.SaveRefToNode(NewNode);
 end;
 
 procedure TImportSource.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
 begin
   Name := ReadString(Node, 'Name', '');
@@ -709 +727 @@
   Format := Sources.AcronymDb.ImportFormats.SearchById(ReadInteger(Node, 'ImportFormat', -1));
   Enabled := ReadBoolean(Node, 'Enabled', True);
+  ItemCount := ReadInteger(Node, 'ItemCount', 0);
+
+  Categories.Db := Sources.AcronymDb;
+  Node2 := Node.FindNode('Categories');
+  if Assigned(Node2) then
+    Categories.LoadRefFromNode(Node2);
 end;
 
@@ -715 +739 @@
   Format := nil;
   Enabled := True;
+  Categories := TAcronymCategories.Create;
+  Categories.OwnsObjects := False;
 end;
 
 destructor TImportSource.Destroy;
-begin
-  inherited Destroy;
-end;
-
-{ TAcronymEntry }
-
-constructor TAcronymEntry.Create;
-begin
-  Categories := TStringList.Create;
-end;
-
-destructor TAcronymEntry.Destroy;
 begin
   FreeAndNil(Categories);
@@ -735 +749 @@
 end;
 
+{ TAcronymEntry }
+
+constructor TAcronymEntry.Create;
+begin
+  Categories := TStringList.Create;
+end;
+
+destructor TAcronymEntry.Destroy;
+begin
+  FreeAndNil(Categories);
+  inherited Destroy;
+end;
+
 { TAcronymMeanings }
 
+procedure TAcronymMeanings.UpdateIds;
+var
+  LastId: Integer;
+  I: Integer;
+begin
+  // Get highest used ID
+  LastId := 0;
+  for I := 0 to Count - 1 do begin
+    if TAcronymCategory(Items[I]).Id > LastId then LastId := TAcronymCategory(Items[I]).Id;
+  end;
+  // Add ID to new items without ID
+  for I := 0 to Count - 1 do begin
+    if TAcronymCategory(Items[I]).Id = 0 then begin
+      Inc(LastId);
+      TAcronymCategory(Items[I]).Id := LastId;
+    end;
+  end;
+end;
+
 procedure TAcronymMeanings.SaveToNode(Node: TDOMNode);
 var
@@ -742 +788 @@
   NewNode2: TDOMNode;
 begin
+  UpdateIds;
   for I := 0 to Count - 1 do
   with TAcronymMeaning(Items[I]) do begin
@@ -764 +811 @@
     Node2 := Node2.NextSibling;
   end;
+  UpdateIds;
 end;
 
@@ -788 +836 @@
 var
   NewNode: TDOMNode;
-  NewNode2: TDOMNode;
-  I: Integer;
 begin
   WriteString(Node, 'Name', Name);
@@ -797 +843 @@
   NewNode := Node.OwnerDocument.CreateElement('Categories');
   Node.AppendChild(NewNode);
-  for I := 0 to Categories.Count - 1 do begin
-    NewNode2 := NewNode.OwnerDocument.CreateElement('Category');
-    NewNode.AppendChild(NewNode2);
-    WriteInteger(NewNode2, 'Id', TAcronymCategory(Categories[I]).Id);
-  end;
+  Categories.SaveRefToNode(NewNode);
 end;
 
@@ -807 +849 @@
 var
   Node2: TDOMNode;
-  Node3: TDOMNode;
-  Category: TAcronymCategory;
-  Id: Integer;
+  I: Integer;
 begin
   Name := ReadString(Node, 'Name', '');
@@ -815 +855 @@
   Language := ReadString(Node, 'Language', '');
 
-  Node3 := Node.FindNode('Categories');
-  if Assigned(Node3) then begin
-    Node2 := Node3.FirstChild;
-    while Assigned(Node2) and (Node2.NodeName = 'Category') do begin
-      Id := ReadInteger(Node2, 'Id', 0);
-      Category := Acronym.Db.Categories.SearchById(Id);
-      if Assigned(Category) then begin
-        Categories.Add(Category);
-        Category.AcronymMeanings.Add(Self);
-      end;
-      Node2 := Node2.NextSibling;
-    end;
+  Categories.Db := Acronym.Db;
+  Node2 := Node.FindNode('Categories');
+  if Assigned(Node2) then begin
+    Categories.LoadRefFromNode(Node2);
+
+    // Add reverse references
+    for I := 0 to Categories.Count - 1 do
+      TAcronymCategory(Categories[I]).AcronymMeanings.Add(Self);
   end;
 end;
@@ -839 +875 @@
   I: Integer;
 begin
+  if Assigned(Acronym) then
+    Acronym.Meanings.Remove(Self);
   for I := 0 to Categories.Count - 1 do
     TAcronymCategory(Categories[I]).AcronymMeanings.Remove(Self);
@@ -942 +980 @@
   end;
   UpdateIds;
+end;
+
+procedure TAcronymCategories.SaveRefToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode: TDOMNode;
+begin
+  for I := 0 to Count - 1 do begin
+    NewNode := Node.OwnerDocument.CreateElement('Category');
+    Node.AppendChild(NewNode);
+    WriteInteger(NewNode, 'Id', TAcronymCategory(Items[I]).Id);
+  end;
+end;
+
+procedure TAcronymCategories.LoadRefFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  Id: Integer;
+  Category: TAcronymCategory;
+begin
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Category') do begin
+    Id := ReadInteger(Node2, 'Id', 0);
+    Category := Db.Categories.SearchById(Id);
+    if Assigned(Category) then begin
+      Add(Category);
+    end;
+    Node2 := Node2.NextSibling;
+  end;
 end;