Changeset 89 for trunk/UAcronym.pas

Timestamp:

Aug 9, 2016, 10:53:36 PM (8 years ago)

Author:

chronos

Message:

• Added: Show from which imports acronym meanings comes from.

This would easy correcting wrong acronyms directly in source.

• Modified: References to categories stored more efficiently in XML project file.

File:

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

trunk/UAcronym.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, XMLConf, XMLRead, XMLWrite, DOM, UXMLUtils,
+  Classes, SysUtils, Contnrs, XMLRead, XMLWrite, DOM, UXMLUtils,
   SpecializedList, fphttpclient, Dialogs, odbcconn, sqldb;
 
@@ -15 +15 @@
   TImportSources = class;
   TImportFormats = class;
-
-  TAcronymSource = class
-    Name: string;
-    URL: string;
-  end;
-
-  TAcronymSources = class(TObjectList)
-
-  end;
 
   { TAcronym }
@@ -56 +47 @@
     Acronym: TAcronym;
     Categories: TAcronymCategories;
-    Source: TAcronymSource;
+    Sources: TImportSources;
+    procedure MergeCategories(MergedCategories: TAcronymCategories);
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -111 +103 @@
     Description: string;
     Categories: TStringList;
+    Sources: TStringList;
     constructor Create;
     destructor Destroy; override;
@@ -174 +167 @@
     procedure TextParse(S: string);
   public
+    Id: Integer;
     Enabled: Boolean;
     Name: string;
@@ -200 +194 @@
   TImportSources = class(TObjectList)
     AcronymDb: TAcronymDb;
+    procedure UpdateIds;
+    function SearchById(Id: Integer): TImportSource;
+    procedure SaveRefToNode(Node: TDOMNode);
+    procedure LoadRefFromNode(Node: TDOMNode);
+    procedure AssignToStrings(Strings: TStrings);
     function SearchByName(Name: string): TImportSource;
     procedure SaveToNode(Node: TDOMNode);
@@ -210 +209 @@
   TAcronymDb = class
     FileName: string;
-    Sources: TAcronymSources;
     Acronyms: TAcronyms;
     Categories: TAcronymCategories;
@@ -298 +296 @@
   SQLQuery1: TSQLQuery;
   NewAcronym: TAcronymEntry;
-  J: Integer;
   AddedAcronym: TAcronymMeaning;
 begin
@@ -329 +326 @@
       if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then begin
         AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
-
-        // Merge categories
-        for J := 0 to Categories.Count - 1 do
-          if AddedAcronym.Categories.IndexOf(Categories[J]) = -1 then begin
-            AddedAcronym.Categories.Add(Categories[J]);
-            TAcronymCategory(Categories[J]).AcronymMeanings.Add(AddedAcronym);
-          end;
+        AddedAcronym.MergeCategories(Categories);
+        if AddedAcronym.Sources.IndexOf(Self) = -1 then
+          AddedAcronym.Sources.Add(Self);
       end;
       SQLQuery1.Next;
@@ -435 +428 @@
   Q: Integer;
   I: Integer;
-  J: Integer;
   T: string;
   LastLength: Integer;
@@ -508 +500 @@
               AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
               AddedAcronym.Description := NewAcronym.Description;
-
-              // Merge categories
-              for J := 0 to Categories.Count - 1 do
-              if AddedAcronym.Categories.IndexOf(Categories[J]) = -1 then begin
-                AddedAcronym.Categories.Add(Categories[J]);
-                TAcronymCategory(Categories[J]).AcronymMeanings.Add(AddedAcronym);
-              end;
+              AddedAcronym.MergeCategories(Categories);
+              if AddedAcronym.Sources.IndexOf(Self) = -1 then
+                AddedAcronym.Sources.Add(Self);
+
               Inc(ItemCount);
             end;
@@ -643 +632 @@
 { TImportSources }
 
+procedure TImportSources.UpdateIds;
+var
+  LastId: Integer;
+  I: Integer;
+begin
+  // Get highest used ID
+  LastId := 0;
+  for I := 0 to Count - 1 do begin
+    if TImportSource(Items[I]).Id > LastId then LastId := TImportSource(Items[I]).Id;
+  end;
+  // Add ID to new items without ID
+  for I := 0 to Count - 1 do begin
+    if TImportSource(Items[I]).Id = 0 then begin
+      Inc(LastId);
+      TImportSource(Items[I]).Id := LastId;
+    end;
+  end;
+end;
+
+function TImportSources.SearchById(Id: Integer): TImportSource;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TImportSource(Items[I]).Id <> Id) do Inc(I);
+  if I < Count then Result := TImportSource(Items[I])
+    else Result := nil;
+end;
+
+procedure TImportSources.SaveRefToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode: TDOMNode;
+begin
+  for I := 0 to Count - 1 do begin
+    NewNode := Node.OwnerDocument.CreateElement('Ref');
+    Node.AppendChild(NewNode);
+    NewNode.TextContent := IntToStr(TImportSource(Items[I]).Id);
+  end;
+end;
+
+procedure TImportSources.LoadRefFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  Id: Integer;
+  Source: TImportSource;
+begin
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Ref') do begin
+    if TryStrToInt(Node2.TextContent, Id) then begin
+      Source := AcronymDb.ImportSources.SearchById(Id);
+      if Assigned(Source) then begin
+        Add(Source);
+      end;
+    end;
+    Node2 := Node2.NextSibling;
+  end;
+end;
+
+procedure TImportSources.AssignToStrings(Strings: TStrings);
+var
+  I: Integer;
+begin
+  Strings.Clear;
+  for I := 0 to Count - 1 do
+    Strings.AddObject(TImportSource(Items[I]).Name, Items[I]);
+end;
+
 function TImportSources.SearchByName(Name: string): TImportSource;
 var
@@ -658 +715 @@
   NewNode2: TDOMNode;
 begin
+  UpdateIds;
   for I := 0 to Count - 1 do
   with TImportSource(Items[I]) do begin
@@ -680 +738 @@
     Node2 := Node2.NextSibling;
   end;
+  UpdateIds;
 end;
 
@@ -854 +913 @@
 begin
   Categories := TStringList.Create;
+  Sources := TStringList.Create;
   Name := '';
   Meaning := '';
@@ -862 +922 @@
 begin
   FreeAndNil(Categories);
+  FreeAndNil(Sources);
   inherited Destroy;
 end;
@@ -936 +997 @@
 { TAcronymMeaning }
 
+procedure TAcronymMeaning.MergeCategories(MergedCategories: TAcronymCategories);
+var
+  I: Integer;
+begin
+  for I := 0 to MergedCategories.Count - 1 do
+  if Categories.IndexOf(MergedCategories[I]) = -1 then begin
+    Categories.Add(MergedCategories[I]);
+    TAcronymCategory(MergedCategories[I]).AcronymMeanings.Add(Self);
+  end;
+end;
+
 procedure TAcronymMeaning.SaveToNode(Node: TDOMNode);
 var
@@ -947 +1019 @@
   Node.AppendChild(NewNode);
   Categories.SaveRefToNode(NewNode);
+
+  NewNode := Node.OwnerDocument.CreateElement('Sources');
+  Node.AppendChild(NewNode);
+  Sources.SaveRefToNode(NewNode);
 end;
 
@@ -967 +1043 @@
       TAcronymCategory(Categories[I]).AcronymMeanings.Add(Self);
   end;
+
+  Sources.AcronymDb := Acronym.Db;
+  Node2 := Node.FindNode('Sources');
+  if Assigned(Node2) then begin
+    Sources.LoadRefFromNode(Node2);
+  end;
 end;
 
@@ -972 +1054 @@
 begin
   Categories := TAcronymCategories.Create(False);
+  Sources := TImportSources.Create(False);
 end;
 
@@ -981 +1064 @@
     TAcronymCategory(Categories[I]).AcronymMeanings.Remove(Self);
   FreeAndNil(Categories);
+  FreeAndNil(Sources);
   inherited Destroy;
 end;
@@ -1089 +1173 @@
 begin
   for I := 0 to Count - 1 do begin
-    NewNode := Node.OwnerDocument.CreateElement('Category');
+    NewNode := Node.OwnerDocument.CreateElement('Ref');
     Node.AppendChild(NewNode);
-    WriteInteger(NewNode, 'Id', TAcronymCategory(Items[I]).Id);
+    NewNode.TextContent := IntToStr(TAcronymCategory(Items[I]).Id);
   end;
 end;
@@ -1101 +1185 @@
   Category: TAcronymCategory;
 begin
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Ref') do begin
+    if TryStrToInt(Node2.TextContent, Id) then begin
+      Category := Db.Categories.SearchById(Id);
+      if Assigned(Category) then begin
+        Add(Category);
+      end;
+    end;
+    Node2 := Node2.NextSibling;
+  end;
+
+  // Old way to store ref Id, remove in future
   Node2 := Node.FirstChild;
   while Assigned(Node2) and (Node2.NodeName = 'Category') do begin
@@ -1238 +1334 @@
 constructor TAcronymDb.Create;
 begin
-  Sources := TAcronymSources.Create;
   Acronyms := TAcronyms.Create;
   Acronyms.Db := Self;
@@ -1251 +1346 @@
   FreeAndNil(ImportFormats);
   FreeAndNil(ImportSources);
-  FreeAndNil(Sources);
   FreeAndNil(Acronyms);
   FreeAndNil(Categories);