Changeset 97 for trunk/UAcronym.pas

Timestamp:

Aug 22, 2016, 1:16:56 PM (8 years ago)

Author:

chronos

Message:

• Added: Add support for acronym category selection in import source format.
• Modified: Optimalized export speed.
• Fixed: Export to MediaWiki tables was not correctly generated for multi line strings.
• Fixed: Add back links from categories to import sources.
• Added: Multi select support in category list.

File:

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

trunk/UAcronym.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Contnrs, XMLRead, XMLWrite, DOM, UXMLUtils,
-  SpecializedList, fphttpclient, Dialogs, odbcconn, sqldb;
+  SpecializedList, fphttpclient2, Dialogs, odbcconn, sqldb;
 
 type
@@ -13 +13 @@
   TAcronymMeanings = class;
   TAcronymDb = class;
+  TImportSource = class;
   TImportSources = class;
   TImportFormats = class;
@@ -73 +74 @@
     Name: string;
     AcronymMeanings: TAcronymMeanings;
+    ImportSources: TImportSources;
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -93 +95 @@
     procedure AssignToStrings(Strings: TStrings);
     procedure AssignFromStrings(Strings: TStrings);
+    procedure AddFromStrings(Strings: TStrings);
     function GetString: string;
+    procedure UpdateLinkImportSources(Item: TImportSource);
+    procedure UpdateLinkAcronymMeanings(Item: TAcronymMeaning);
   end;
 
@@ -108 +113 @@
   end;
 
-  TImportPatternFlag = (ipfNone, ipfNewItem, ipfSkip, ipfRemove);
-  TImportVariable = (ivNone, ivAcronym, ivMeaning, ivDescription);
+  TImportPatternFlag = (ipfSet, ipfNewItem, ipfSkip, ipfRemove, ipfCleanSet);
+  TImportVariable = (ivNone, ivAcronym, ivMeaning, ivDescription, ivCategory);
 
   { TImportPattern }
@@ -244 +249 @@
   SMeaning = 'Meaning';
   SAcronym = 'Acronym';
+  SCategory = 'Category';
   SNone = 'None';
   SNewItem = 'New item';
@@ -258 +264 @@
   ImportVariableString[ivMeaning] := SMeaning;
   ImportVariableString[ivDescription] := SDescription;
-  ImportPatternFlagString[ipfNone] := SNone;
+  ImportVariableString[ivCategory] := SCategory;
+  ImportPatternFlagString[ipfSet] := SNone;
   ImportPatternFlagString[ipfNewItem] := SNewItem;
   ImportPatternFlagString[ipfSkip] := SSkip;
@@ -429 +436 @@
   I: Integer;
   T: string;
+  TT: string;
   LastLength: Integer;
   AddedAcronym: TAcronymMeaning;
+  NewCategory: TAcronymCategory;
 begin
   NewAcronym := TAcronymEntry.Create;
@@ -492 +501 @@
               ivMeaning: NewAcronym.Meaning := T;
               ivDescription: NewAcronym.Description := T;
+              ivCategory: begin
+                NewAcronym.Categories.Clear;
+                while T <> '' do begin
+                  if Pos(',', T) > 0 then begin
+                    TT := Copy(T, 1, Pos(',', T) - 1);
+                    Delete(T, 1, Length(TT) + 1);
+                  end else begin
+                    TT := T;
+                    T := '';
+                  end;
+                  TT := Trim(TT);
+                  NewCategory := Sources.AcronymDb.Categories.SearchByName(TT);
+                  if not Assigned(NewCategory) then begin
+                    NewCategory := TAcronymCategory.Create;
+                    NewCategory.Name := TT;
+                    Sources.AcronymDb.Categories.Add(NewCategory);
+                  end;
+                  NewAcronym.Categories.AddObject(TT, NewCategory);
+                end;
+              end;
             end;
           end;
@@ -501 +530 @@
               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);
@@ -877 +908 @@
 var
   Node2: TDOMNode;
+  I: Integer;
 begin
   Name := ReadString(Node, 'Name', '');
@@ -890 +922 @@
   if Assigned(Node2) then
     Categories.LoadRefFromNode(Node2);
+
+  // Add reverse references
+  for I := 0 to Categories.Count - 1 do
+    TAcronymCategory(Categories[I]).ImportSources.Add(Self);
 end;
 
@@ -902 +938 @@
 
 destructor TImportSource.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Categories.Count - 1 do
+    TAcronymCategory(Categories[I]).ImportSources.Remove(Self);
+  FreeAndNil(Categories);
   FreeAndNil(ResponseStream);
-  FreeAndNil(Categories);
   inherited Destroy;
 end;
@@ -1245 +1285 @@
 
 procedure TAcronymCategories.AssignFromStrings(Strings: TStrings);
-var
-  I: Integer;
 begin
   Clear;
+  AddFromStrings(Strings);
+end;
+
+procedure TAcronymCategories.AddFromStrings(Strings: TStrings);
+var
+  I: Integer;
+begin
   for I := 0 to Strings.Count - 1 do begin
     Add(TAcronymCategory(Strings.Objects[I]));
@@ -1264 +1309 @@
 end;
 
+procedure TAcronymCategories.UpdateLinkImportSources(Item: TImportSource);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    if TAcronymCategory(Items[I]).ImportSources.IndexOf(Item) = -1 then
+      TAcronymCategory(Items[I]).ImportSources.Add(Item);
+end;
+
+procedure TAcronymCategories.UpdateLinkAcronymMeanings(Item: TAcronymMeaning);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    if TAcronymCategory(Items[I]).AcronymMeanings.IndexOf(Item) = -1 then
+      TAcronymCategory(Items[I]).AcronymMeanings.Add(Item);
+end;
+
 
 { TAcronym }
@@ -1318 +1381 @@
 begin
   AcronymMeanings := TAcronymMeanings.Create(False);
+  ImportSources := TImportSources.Create(False);
 end;
 
@@ -1327 +1391 @@
     TAcronymMeaning(AcronymMeanings[I]).Categories.Remove(Self);
   FreeAndNil(AcronymMeanings);
+  for I := 0 to ImportSources.Count - 1 do
+    TImportSource(ImportSources[I]).Categories.Remove(Self);
+  FreeAndNil(ImportSources);
   inherited Destroy;
 end;