Changeset 50 for trunk/UAcronym.pas

Timestamp:

Jul 25, 2016, 5:07:25 PM (8 years ago)

Author:

chronos

Message:

• Added: New pattern action "Remove on start".

File:

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

trunk/UAcronym.pas

@@ -115 +115 @@
   end;
 
-  TImportPatternFlag = (ipfNone, ipfNewItem, ipfSkip);
+  TImportPatternFlag = (ipfNone, ipfNewItem, ipfSkip, ipfRemove);
   TImportVariable = (ivNone, ivAcronym, ivMeaning, ivDescription);
 
@@ -247 +247 @@
   SNewItem = 'New item';
   SSkip = 'Skip';
+  SRemoveOnStart = 'Remove on start';
+  SUnsupportedAuthMethod = 'Unsupported HTTP authorization method';
 
 
@@ -258 +260 @@
   ImportPatternFlagString[ipfNewItem] := SNewItem;
   ImportPatternFlagString[ipfSkip] := SSkip;
+  ImportPatternFlagString[ipfRemove] := SRemoveOnStart;
 end;
 
@@ -393 +396 @@
 var
   H: string;
-  P: Integer;
 begin
   with TFPHttpClient(Sender) do begin
@@ -400 +402 @@
 
     if H <> 'Basic' then
-      raise Exception.Create('Unsupported HTTP authorization method');
+      raise Exception.Create(SUnsupportedAuthMethod);
 
     if (Self.UserName <> '') and (UserName = '') then begin
@@ -440 +442 @@
 
   // Remove unneeded items
-{  repeat
+  repeat
     LastLength := Length(S);
     for I := 0 to Format.ItemPatterns.Count - 1 do
     with TImportPattern(Format.ItemPatterns[I]) do
-    if Flag = ipfSkip then begin
+    if Flag = ipfRemove then begin
       P := Pos(StartString, S);
       if P > 0 then begin
@@ -455 +457 @@
     end;
   until Length(S) = LastLength;
-}
+
   // Find items
   repeat
@@ -462 +464 @@
     while I < Format.ItemPatterns.Count do
     with TImportPattern(Format.ItemPatterns[I]) do begin
-      if Flag <> ipfSkip then begin
+      if Flag <> ipfRemove then begin
         if Length(StartString) > 0 then begin
           P := Pos(StartString, S);
@@ -470 +472 @@
         if ((Length(StartString) > 0) and (P > 0)) or (Length(StartString) = 0) then begin
           P := Pos(EndString, S);
-          T := StripHTML(Copy(S, 1, P - 1));
-          T := StringReplace(T, '&quot;', '"', [rfReplaceAll]);
-          T := StringReplace(T, '&trade;', 'TM', [rfReplaceAll]);
-          T := StringReplace(T, '&amp;', '&', [rfReplaceAll]);
-          T := StringReplace(T, '&#160;', ' ', [rfReplaceAll]); // No break space
-          T := Trim(T);
-          case Variable of
-            ivAcronym: NewAcronym.Name := T;
-            ivMeaning: NewAcronym.Meaning := T;
-            ivDescription: NewAcronym.Description := T;
+          T := Copy(S, 1, P - 1);
+          if Flag <> ipfSkip then begin
+            T := StripHTML(T);
+            T := StringReplace(T, '&quot;', '"', [rfReplaceAll]);
+            T := StringReplace(T, '&trade;', 'TM', [rfReplaceAll]);
+            T := StringReplace(T, '&amp;', '&', [rfReplaceAll]);
+            T := StringReplace(T, '&#160;', ' ', [rfReplaceAll]); // No break space
+            T := Trim(T);
+            case Variable of
+              ivAcronym: NewAcronym.Name := T;
+              ivMeaning: NewAcronym.Meaning := T;
+              ivDescription: NewAcronym.Description := T;
+            end;
           end;
           Delete(S, 1, P + Length(EndString) - 1);