Changeset 97 for trunk/Forms/UFormExport.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/Forms/UFormExport.pas (modified) (4 diffs)

trunk/Forms/UFormExport.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  UJobProgressView;
 
 type
@@ -22 +23 @@
     procedure FormCreate(Sender: TObject);
   private
-    procedure ExportCSV;
-    procedure ExportMediaWiki;
-    procedure ExportMediaWikiTable;
+    ItemCount: Integer;
+    procedure JobExportCSV(Job: TJob);
+    procedure JobExportMediaWiki(Job: TJob);
+    procedure JobExportMediaWikiTable(Job: TJob);
   public
     { public declarations }
@@ -40 +42 @@
 
 resourcestring
-  SExpotedAcronyms = 'Exported %d acronyms';
+  SExportedAcronyms = 'Exported %d acronyms';
+  SExporting = 'Exporting';
 
 { TFormExport }
@@ -59 +62 @@
 end;
 
-procedure TFormExport.ExportCSV;
+procedure TFormExport.JobExportCSV(Job: TJob);
 var
   I: Integer;
   J: Integer;
-  ItemCount: Integer;
+  Content: string;
 begin
-  Memo1.Lines.Clear;
-  Memo1.Lines.BeginUpdate;
+  Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
   ItemCount := 0;
-  for I := 0 to Core.AcronymDb.Acronyms.Count - 1 do
-  with TAcronym(Core.AcronymDb.Acronyms[I]) do
-    for J := 0 to Meanings.Count - 1 do
-    with TAcronymMeaning(Meanings[J]) do begin
-      Memo1.Lines.Add('"' + Acronym.Name + '","' + Name + '","' + Description + '","' + Categories.GetString + '"');
-      Inc(ItemCount);
-    end;
-  Memo1.Lines.EndUpdate;
-  ShowMessage(Format(SExpotedAcronyms, [ItemCount]));
-end;
-
-procedure TFormExport.ExportMediaWiki;
-var
-  I: Integer;
-  J: Integer;
-  ItemCount: Integer;
-begin
-  Memo1.Lines.Clear;
-  Memo1.Lines.BeginUpdate;
-  ItemCount := 0;
-  for I := 0 to Core.AcronymDb.Acronyms.Count - 1 do
-  with TAcronym(Core.AcronymDb.Acronyms[I]) do begin
-    Memo1.Lines.Add('; ' + Name);
-    for J := 0 to Meanings.Count - 1 do
-    with TAcronymMeaning(Meanings[J]) do begin
-      Memo1.Lines.Add(': ' + Name);
-      Inc(ItemCount);
-    end;
-  end;
-  Memo1.Lines.EndUpdate;
-  ShowMessage(Format(SExpotedAcronyms, [ItemCount]));
-end;
-
-procedure TFormExport.ExportMediaWikiTable;
-var
-  I: Integer;
-  J: Integer;
-  ItemCount: Integer;
-begin
-  Memo1.Lines.Clear;
-  Memo1.Lines.BeginUpdate;
-  ItemCount := 0;
-  Memo1.Lines.Add('{| class="wikitable sortable"');
-  Memo1.Lines.Add('! Name !! Meaning !! Description !! Categories');
+  Content := '';
   for I := 0 to Core.AcronymDb.Acronyms.Count - 1 do
   with TAcronym(Core.AcronymDb.Acronyms[I]) do begin
     for J := 0 to Meanings.Count - 1 do
     with TAcronymMeaning(Meanings[J]) do begin
-      Memo1.Lines.Add('|-');
-      Memo1.Lines.Add('| ' + Acronym.Name + ' || ' + Name + ' || ' + Description + ' || ' + Categories.GetString);
+      Content := Content + '"' + Acronym.Name + '","' + Name + '","' + Description + '","' + Categories.GetString + '"' + LineEnding;
       Inc(ItemCount);
     end;
+    Job.Progress.Increment;
+    if Job.Terminate then Break;
   end;
-  Memo1.Lines.Add('|}');
-  Memo1.Lines.EndUpdate;
-  ShowMessage(Format(SExpotedAcronyms, [ItemCount]));
+  Memo1.Lines.Text := Content;
+end;
+
+procedure TFormExport.JobExportMediaWiki(Job: TJob);
+var
+  I: Integer;
+  J: Integer;
+  Content: string;
+begin
+  Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
+  ItemCount := 0;
+  Content := '';
+  for I := 0 to Core.AcronymDb.Acronyms.Count - 1 do
+  with TAcronym(Core.AcronymDb.Acronyms[I]) do begin
+    Content := Content + '; ' + Name + LineEnding;
+    for J := 0 to Meanings.Count - 1 do
+    with TAcronymMeaning(Meanings[J]) do begin
+      Content := Content + ': ' + Name + LineEnding;
+      Inc(ItemCount);
+    end;
+    Job.Progress.Increment;
+    if Job.Terminate then Break;
+  end;
+  Memo1.Lines.Text := Content;
+end;
+
+procedure TFormExport.JobExportMediaWikiTable(Job: TJob);
+var
+  I: Integer;
+  J: Integer;
+  Line: string;
+  Content: string;
+begin
+  Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
+  ItemCount := 0;
+  Content := '{| class="wikitable sortable"' + LineEnding +
+    '! Name !! Meaning !! Description !! Categories' + LineEnding;
+  for I := 0 to Core.AcronymDb.Acronyms.Count - 1 do
+  with TAcronym(Core.AcronymDb.Acronyms[I]) do begin
+    for J := 0 to Meanings.Count - 1 do
+    with TAcronymMeaning(Meanings[J]) do begin
+      Content := Content + '|-' + LineEnding +
+        '| ' + Acronym.Name + LineEnding + '| ' + Name + LineEnding +
+        '| ' + Description + LineEnding + '| ' + Categories.GetString + LineEnding;
+      Inc(ItemCount);
+    end;
+    Job.Progress.Increment;
+    if Job.Terminate then Break;
+  end;
+  Content := Content + '|}' + LineEnding;
+  Memo1.Lines.Text := Content;
 end;
 
 procedure TFormExport.ButtonProcessClick(Sender: TObject);
 begin
-  if ComboBoxDataFormat.ItemIndex = 0 then ExportCSV;
-  if ComboBoxDataFormat.ItemIndex = 1 then ExportMediaWiki;
-  if ComboBoxDataFormat.ItemIndex = 2 then ExportMediaWikiTable;
+  if ComboBoxDataFormat.ItemIndex = 0 then
+    Core.JobProgressView1.AddJob(SExporting, JobExportCSV);
+  if ComboBoxDataFormat.ItemIndex = 1 then
+    Core.JobProgressView1.AddJob(SExporting, JobExportMediaWiki);
+  if ComboBoxDataFormat.ItemIndex = 2 then
+    Core.JobProgressView1.AddJob(SExporting, JobExportMediaWikiTable);
+  Core.JobProgressView1.Start;
+  ShowMessage(Format(SExportedAcronyms, [ItemCount]));
 end;