Changeset 230 for trunk/Acronym.pas

Timestamp:

Jan 24, 2025, 11:42:58 PM (9 days ago)

Author:

chronos

Message:

• Modified: Fixed Import sources modification.
• Modified: Catogires don't have direct object references to import sources and acronym meanings.
• Modified: Updated acronyms example file.

File:

• trunk/Acronym.pas (modified) (47 diffs)

trunk/Acronym.pas

@@ -24 +24 @@
     Name: string;
     Meanings: TAcronymMeanings;
+    procedure Assign(Source: TAcronym);
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -34 +35 @@
   TAcronyms = class(TObjectList<TAcronym>)
     Db: TAcronymDb;
+    procedure Assign(Source: TAcronyms);
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -50 +52 @@
     Categories: TAcronymCategories;
     Sources: TImportSources;
+    procedure Assign(Source: TAcronymMeaning);
     procedure MergeCategories(MergedCategories: TAcronymCategories);
     procedure SaveToNode(Node: TDOMNode);
@@ -62 +65 @@
   public
     Acronym: TAcronym;
+    procedure Assign(Source: TAcronymMeanings);
     procedure UpdateIds;
     procedure SaveToNode(Node: TDOMNode);
@@ -75 +79 @@
     Id: Integer;
     Name: string;
-    AcronymMeanings: TAcronymMeanings;
-    ImportSources: TImportSources;
     Enabled: Boolean;
+    AcronymDb: TAcronymDb;
+    function GetAcronymMeanings: TAcronymMeanings;
+    function GetAcronymMeaningsCount: Integer;
+    function GetImportSources: TImportSources;
+    function GetImportSourcesCount: Integer;
     procedure Assign(Source: TAcronymCategory);
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
     constructor Create;
-    destructor Destroy; override;
   end;
 
@@ -103 +109 @@
     procedure Assign(Source: TAcronymCategories);
     function GetString: string;
-    procedure UpdateLinkImportSources(Item: TImportSource);
-    procedure UpdateLinkAcronymMeanings(Item: TAcronymMeaning);
     function IsAnyEnabled: Boolean;
   end;
@@ -164 +168 @@
 
   TImportFormats = class(TObjectList<TImportFormat>)
+    procedure Assign(Source: TImportFormats);
     procedure UpdateIds;
     procedure SaveToNode(Node: TDOMNode);
@@ -177 +182 @@
     ResponseStream: TMemoryStream;
     procedure DoPassword(Sender: TObject; var RepeatRequest : Boolean);
-    procedure TextParse(S: string);
+    procedure TextParse(AcronymDb: TAcronymDb; S: string);
   public
     Id: Integer;
@@ -191 +196 @@
     Password: string;
     function DownloadHTTP(URL: string; Stream: TStream): Boolean;
-    procedure Process;
-    procedure ProcessTextParseURL;
-    procedure ProcessTextParseFile;
-    procedure ProcessMSAccess;
+    procedure Process(AcronymDb: TAcronymDb);
+    procedure ProcessTextParseURL(AcronymDb: TAcronymDb);
+    procedure ProcessTextParseFile(AcronymDb: TAcronymDb);
+    procedure ProcessMSAccess(AcronymDb: TAcronymDb);
     procedure Assign(Source: TImportSource);
     procedure SaveToNode(Node: TDOMNode);
@@ -211 +216 @@
     procedure LoadRefFromNode(Node: TDOMNode);
     procedure AssignToStrings(Strings: TStrings);
+    procedure Assign(Source: TImportSources);
     function SearchByName(Name: string): TImportSource;
     procedure SaveToNode(Node: TDOMNode);
@@ -233 +239 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Assign(Source: TAcronymDb);
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
@@ -307 +314 @@
 { TImportSourceMSAccess }
 
-procedure TImportSource.ProcessMSAccess;
+procedure TImportSource.ProcessMSAccess(AcronymDb: TAcronymDb);
 var
   ODBCConnection1: TODBCConnection;
@@ -342 +349 @@
       NewAcronym.Meaning := Trim(WinCPToUTF8(SQLQuery1.FieldByName('Meaning').AsString));
       if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then begin
-        AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+        AddedAcronym := AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
         AddedAcronym.MergeCategories(Categories);
         if AddedAcronym.Sources.IndexOf(Self) = -1 then
@@ -437 +444 @@
 end;
 
-procedure TImportSource.TextParse(S: string);
+procedure TImportSource.TextParse(AcronymDb: TAcronymDb; S: string);
 var
   SS: string;
@@ -490 +497 @@
     with Format.ItemPatterns[I] do begin
       if Flag <> ipfRemove then begin
+        TT := StartString;
         if Length(StartString) > 0 then begin
           P := Pos(StartString, S);
@@ -523 +531 @@
                   end;
                   TT := Trim(TT);
-                  NewCategory := Sources.AcronymDb.Categories.SearchByName(TT);
+                  NewCategory := AcronymDb.Categories.SearchByName(TT);
                   if not Assigned(NewCategory) then begin
                     NewCategory := TAcronymCategory.Create;
                     NewCategory.Name := TT;
-                    Sources.AcronymDb.Categories.Add(NewCategory);
+                    AcronymDb.Categories.Add(NewCategory);
                   end;
                   NewAcronym.Categories.AddObject(TT, NewCategory);
@@ -538 +546 @@
           if (Flag = ipfNewItem) and (NewAcronym.Name <> '') and
             (NewAcronym.Meaning <> '') then begin
-              AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+              AddedAcronym := AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
               AddedAcronym.Description := NewAcronym.Description;
               AddedAcronym.MergeCategories(Categories);
               AddedAcronym.Categories.AddFromStrings(NewAcronym.Categories);
-              AddedAcronym.Categories.UpdateLinkAcronymMeanings(AddedAcronym);
               if AddedAcronym.Sources.IndexOf(Self) = -1 then
                 AddedAcronym.Sources.Add(Self);
@@ -593 +600 @@
   I: Integer;
 begin
-  List.Clear;
+  List.Count := Count;
   for I := 0 to Count - 1 do
-    List.Add(Items[I]);
-end;
-
-procedure TImportSource.Process;
+    List[I] := Items[I];
+end;
+
+procedure TImportSource.Process(AcronymDb: TAcronymDb);
 begin
   ItemCount := 0;
   case Format.Kind of
-    ifkParseURL: ProcessTextParseURL;
-    ifkMSAccess: ProcessMSAccess;
-    ifkParseFile: ProcessTextParseFile;
+    ifkParseURL: ProcessTextParseURL(AcronymDb);
+    ifkMSAccess: ProcessMSAccess(AcronymDb);
+    ifkParseFile: ProcessTextParseFile(AcronymDb);
     else raise Exception.Create(SUnsupportedImportFormat);
   end;
@@ -742 +749 @@
 end;
 
+procedure TImportSources.Assign(Source: TImportSources);
+begin
+
+end;
+
 function TImportSources.SearchByName(Name: string): TImportSource;
 var
@@ -795 +807 @@
 end;
 
+procedure TImportFormats.Assign(Source: TImportFormats);
+begin
+
+end;
+
 procedure TImportFormats.UpdateIds;
 var
@@ -856 +873 @@
 { TImportSource }
 
-procedure TImportSource.ProcessTextParseURL;
+procedure TImportSource.ProcessTextParseURL(AcronymDb: TAcronymDb);
 var
   S: string;
@@ -867 +884 @@
     ResponseStream.Read(S[1], Length(S));
 
-    TextParse(S);
-  end;
-end;
-
-procedure TImportSource.ProcessTextParseFile;
+    TextParse(AcronymDb, S);
+  end;
+end;
+
+procedure TImportSource.ProcessTextParseFile(AcronymDb: TAcronymDb);
 var
   S: TStringList;
@@ -879 +896 @@
     try
       S.LoadFromFile(URL);
-      TextParse(S.Text);
+      TextParse(AcronymDb, S.Text);
     finally
       S.Free;
@@ -920 +937 @@
 var
   Node2: TDOMNode;
-  I: Integer;
 begin
   Name := ReadString(Node, 'Name', '');
@@ -934 +950 @@
   if Assigned(Node2) then
     Categories.LoadRefFromNode(Node2);
-
-  // Add reverse references
-  for I := 0 to Categories.Count - 1 do
-    Categories[I].ImportSources.Add(Self);
 end;
 
@@ -950 +962 @@
 
 destructor TImportSource.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Categories.Count - 1 do
-    Categories[I].ImportSources.Remove(Self);
+begin
   FreeAndNil(Categories);
   FreeAndNil(ResponseStream);
@@ -979 +987 @@
 
 { TAcronymMeanings }
+
+procedure TAcronymMeanings.Assign(Source: TAcronymMeanings);
+begin
+
+end;
 
 procedure TAcronymMeanings.UpdateIds;
@@ -1049 +1062 @@
   Result := TAcronymMeaning.Create;
   Result.Name := Name;
+  Result.Acronym := Acronym;
   Add(Result);
 end;
@@ -1064 +1078 @@
 { TAcronymMeaning }
 
+procedure TAcronymMeaning.Assign(Source: TAcronymMeaning);
+begin
+  Name := Source.Name;
+  Description := Source.Description;
+  Language := Source.Language;
+  Categories.Assign(Source.Categories);
+  Sources.Assign(Source.Sources);
+end;
+
 procedure TAcronymMeaning.MergeCategories(MergedCategories: TAcronymCategories);
 var
@@ -1071 +1094 @@
   if Categories.IndexOf(MergedCategories[I]) = -1 then begin
     Categories.Add(MergedCategories[I]);
-    MergedCategories[I].AcronymMeanings.Add(Self);
   end;
 end;
@@ -1095 +1117 @@
 var
   Node2: TDOMNode;
-  I: Integer;
 begin
   Name := ReadString(Node, 'Name', '');
@@ -1105 +1126 @@
   if Assigned(Node2) then begin
     Categories.LoadRefFromNode(Node2);
-
-    // Add reverse references
-    for I := 0 to Categories.Count - 1 do
-      Categories[I].AcronymMeanings.Add(Self);
   end;
 
@@ -1125 +1142 @@
 
 destructor TAcronymMeaning.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Categories.Count - 1 do
-    Categories[I].AcronymMeanings.Remove(Self);
+begin
   FreeAndNil(Categories);
   FreeAndNil(Sources);
@@ -1136 +1149 @@
 
 { TAcronyms }
+
+procedure TAcronyms.Assign(Source: TAcronyms);
+begin
+
+end;
 
 procedure TAcronyms.SaveToNode(Node: TDOMNode);
@@ -1184 +1202 @@
   Result := TAcronym.Create;
   Result.Name := Name;
+  Result.Db := Db;
   Add(Result);
 end;
@@ -1199 +1218 @@
     if Items[I].Id > LastId then LastId := Items[I].Id;
   end;
+
   // Add ID to new items without ID
   for I := 0 to Count - 1 do begin
@@ -1231 +1251 @@
   while Assigned(Node2) and (Node2.NodeName = 'Category') do begin
     NewItem := TAcronymCategory.Create;
+    NewItem.AcronymDb := Db;
     NewItem.LoadFromNode(Node2);
     Add(NewItem);
@@ -1259 +1280 @@
   while Assigned(Node2) and (Node2.NodeName = 'Ref') do begin
     if TryStrToInt(string(Node2.TextContent), Id) then begin
-      Category := Db.Categories.SearchById(Id);
-      if Assigned(Category) then begin
-        Add(Category);
+      Category := SearchById(Id);
+      if not Assigned(Category) then begin
+        Category := Db.Categories.SearchById(Id);
+        if Assigned(Category) then begin
+          Add(Category);
+        end;
       end;
     end;
@@ -1334 +1358 @@
   I: Integer;
 begin
-  List.Clear;
+  List.Count := Count;
   for I := 0 to Count - 1 do
-    List.Add(Items[I]);
+    List[I] := Items[I];
 end;
 
@@ -1347 +1371 @@
   for I := 0 to Source.Count - 1 do begin
     NewCategory := TAcronymCategory.Create;
+    NewCategory.AcronymDb := Db;
     NewCategory.Assign(Source[I]);
     Add(NewCategory);
@@ -1360 +1385 @@
     Result := Result + Items[I].Name + ',';
   System.Delete(Result, Length(Result), 1);
-end;
-
-procedure TAcronymCategories.UpdateLinkImportSources(Item: TImportSource);
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    if Items[I].ImportSources.IndexOf(Item) = -1 then
-      Items[I].ImportSources.Add(Item);
-end;
-
-procedure TAcronymCategories.UpdateLinkAcronymMeanings(Item: TAcronymMeaning);
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    if Items[I].AcronymMeanings.IndexOf(Item) = -1 then
-      Items[I].AcronymMeanings.Add(Item);
 end;
 
@@ -1394 +1401 @@
 { TAcronym }
 
+procedure TAcronym.Assign(Source: TAcronym);
+begin
+  Name := Source.Name;
+  Meanings.Assign(Source.Meanings);
+end;
+
 procedure TAcronym.SaveToNode(Node: TDOMNode);
 var
@@ -1430 +1443 @@
 { TAcronymCategory }
 
+function TAcronymCategory.GetAcronymMeanings: TAcronymMeanings;
+var
+  I: Integer;
+  J: Integer;
+begin
+  Result := TAcronymMeanings.Create(False);
+  for I := 0 to AcronymDb.Acronyms.Count - 1 do
+  with AcronymDb.Acronyms[I] do begin
+    for J := 0 to Meanings.Count - 1 do
+    with Meanings[J] do
+    if Assigned(Categories.SearchById(Self.Id)) then
+      Result.Add(Meanings[J]);
+  end;
+end;
+
+function TAcronymCategory.GetAcronymMeaningsCount: Integer;
+var
+  I: Integer;
+  J: Integer;
+begin
+  Result := 0;
+  for I := 0 to AcronymDb.Acronyms.Count - 1 do
+  with AcronymDb.Acronyms[I] do begin
+    for J := 0 to Meanings.Count - 1 do
+    with Meanings[J] do
+    if Assigned(Categories.SearchById(Self.Id)) then
+      Inc(Result);
+  end;
+end;
+
+function TAcronymCategory.GetImportSources: TImportSources;
+var
+  I: Integer;
+begin
+  Result := TImportSources.Create(False);
+  for I := 0 to AcronymDb.ImportSources.Count - 1 do
+  with AcronymDb.ImportSources[I] do
+  if Assigned(Categories.SearchById(Self.Id)) then
+    Result.Add(AcronymDb.ImportSources[I]);
+end;
+
+function TAcronymCategory.GetImportSourcesCount: Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to AcronymDb.ImportSources.Count - 1 do
+  with AcronymDb.ImportSources[I] do
+  if Assigned(Categories.SearchById(Self.Id)) then
+    Inc(Result);
+end;
+
 procedure TAcronymCategory.Assign(Source: TAcronymCategory);
 begin
   Id := Source.Id;
   Name := Source.Name;
-  // AcronymMeanings.Assign(Source.AcronymMeanings);
-  // ImportSources.Assign(Source.ImportSources);
   Enabled := Source.Enabled;
 end;
@@ -1458 +1521 @@
   Name := '';
   Enabled := True;
-  AcronymMeanings := TAcronymMeanings.Create(False);
-  ImportSources := TImportSources.Create(False);
-end;
-
-destructor TAcronymCategory.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to AcronymMeanings.Count - 1 do
-    AcronymMeanings[I].Categories.Remove(Self);
-  FreeAndNil(AcronymMeanings);
-  for I := 0 to ImportSources.Count - 1 do
-    ImportSources[I].Categories.Remove(Self);
-  FreeAndNil(ImportSources);
-  inherited;
 end;
 
@@ -1498 +1546 @@
   FreeAndNil(Categories);
   inherited;
+end;
+
+procedure TAcronymDb.Assign(Source: TAcronymDb);
+begin
+  Modified := Source.Modified;
+  AddedCount := Source.AddedCount;
+  FileName := Source.FileName;
+  Categories.Assign(Source.Categories);
+  Acronyms.Assign(Source.Acronyms);
+  ImportFormats.Assign(Source.ImportFormats);
+  ImportSources.Assign(Source.ImportSources);
 end;
 
@@ -1624 +1683 @@
         end;
         NewMeaning.Categories.Add(AcronymCategory);
-        AcronymCategory.AcronymMeanings.Add(NewMeaning);
       end;
     end;
@@ -1709 +1767 @@
   if not Assigned(Acronym) then begin
     Acronym := TAcronym.Create;
+    Acronym.Db := Self;
     Acronym.Name := AcronymName;
     Acronyms.Add(Acronym);