Changeset 56 for trunk/UAcronym.pas

Timestamp:

Jul 26, 2016, 2:13:41 PM (8 years ago)

Author:

chronos

Message:

• Added: Show how many new acronyms were imported.

File:

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

trunk/UAcronym.pas

@@ -216 +216 @@
     ImportFormats: TImportFormats;
     Modified: Boolean;
+    AddedCount: Integer;
     constructor Create;
     destructor Destroy; override;
@@ -250 +251 @@
   SRemoveOnStart = 'Remove on start';
   SUnsupportedAuthMethod = 'Unsupported HTTP authorization method';
+  SFileNotFound = 'File %s not found';
 
 
@@ -323 +325 @@
       NewAcronym.Name := SQLQuery1.FieldByName('Acronym').AsString;
       NewAcronym.Meaning := SQLQuery1.FieldByName('Meaning').AsString;
-      Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+      if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then
+        Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
       SQLQuery1.Next;
       Inc(ItemCount);
@@ -489 +492 @@
           Delete(S, 1, P + Length(EndString) - 1);
 
-          if (Flag = ipfNewItem) and (Trim(NewAcronym.Name) <> '') and
-            (Trim(NewAcronym.Meaning) <> '') then begin
+          if (Flag = ipfNewItem) and (NewAcronym.Name <> '') and
+            (NewAcronym.Meaning <> '') then begin
               AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
               AddedAcronym.Description := NewAcronym.Description;
@@ -749 +752 @@
       S.Free;
     end;
-  end else ShowMessage('File ' + URL + ' not found');
+  end else ShowMessage(SysUtils.Format(SFileNotFound, [URL]));
 end;
 
@@ -823 +826 @@
 begin
   Categories := TStringList.Create;
+  Name := '';
+  Meaning := '';
+  Description := '';
 end;
 
@@ -1432 +1438 @@
     Meaning.Acronym := Acronym;
     Acronym.Meanings.Add(Meaning);
+    Inc(AddedCount);
   end;
   Result := Meaning;