Changeset 34 for trunk/UAcronym.pas

Timestamp:

Jul 13, 2016, 3:24:45 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Error during removing acronyms in case that multiple acronyms with same name exists.

File:

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

trunk/UAcronym.pas

@@ -218 +218 @@
     procedure FilterList(AName: string; Items: TAcronymMeanings);
     function AddAcronym(AcronymName, MeaningName: string): TAcronymMeaning;
+    procedure RemoveMeaning(Meaning: TAcronymMeaning);
     procedure RemoveAcronym(AcronymName, MeaningName: string);
     procedure AssignToList(List: TListObject);
@@ -772 +773 @@
   LastId := 0;
   for I := 0 to Count - 1 do begin
-    if TAcronymCategory(Items[I]).Id > LastId then LastId := TAcronymCategory(Items[I]).Id;
+    if TAcronymMeaning(Items[I]).Id > LastId then LastId := TAcronymMeaning(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
+    if TAcronymMeaning(Items[I]).Id = 0 then begin
       Inc(LastId);
-      TAcronymCategory(Items[I]).Id := LastId;
+      TAcronymMeaning(Items[I]).Id := LastId;
     end;
   end;
@@ -875 +876 @@
   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);
@@ -1370 +1369 @@
 end;
 
+procedure TAcronymDb.RemoveMeaning(Meaning: TAcronymMeaning);
+var
+  Acronym: TAcronym;
+begin
+  Acronym := Meaning.Acronym;
+  Acronym.Meanings.Remove(Meaning);
+  if Acronym.Meanings.Count = 0 then
+    Acronyms.Remove(Acronym);
+  Modified := True;
+end;
+
 procedure TAcronymDb.RemoveAcronym(AcronymName, MeaningName: string);
 var
@@ -1378 +1388 @@
   if Assigned(Acronym) then begin
     Meaning := Acronym.Meanings.SearchByName(MeaningName);
-    if Assigned(Meaning) then begin
-      Acronym.Meanings.Remove(Meaning);
-      if Acronym.Meanings.Count = 0 then
-        Acronyms.Remove(Acronym);
-    end;
-  end;
-  Modified := True;
+    if Assigned(Meaning) then RemoveMeaning(Meaning);
+  end;
 end;