Changeset 88 for trunk/UAcronym.pas

Timestamp:

Aug 8, 2016, 2:38:37 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Merge categories to new items also for MS Access source import.
• Fixed: Trim name and meaning imported from MS Access.

File:

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

trunk/UAcronym.pas

@@ -298 +298 @@
   SQLQuery1: TSQLQuery;
   NewAcronym: TAcronymEntry;
+  J: Integer;
+  AddedAcronym: TAcronymMeaning;
 begin
   ItemCount := 0;
@@ -323 +325 @@
     NewAcronym := TAcronymEntry.Create;
     while not SQLQuery1.EOF do begin
-      NewAcronym.Name := SQLQuery1.FieldByName('Acronym').AsString;
-      NewAcronym.Meaning := SQLQuery1.FieldByName('Meaning').AsString;
-      if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then
-        Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+      NewAcronym.Name := Trim(SQLQuery1.FieldByName('Acronym').AsString);
+      NewAcronym.Meaning := Trim(SQLQuery1.FieldByName('Meaning').AsString);
+      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;
+      end;
       SQLQuery1.Next;
       Inc(ItemCount);