Changeset 28 for trunk/UAcronym.pas

Timestamp:

Jul 12, 2016, 4:28:22 PM (8 years ago)

Author:

chronos

Message:

• Added: Import format items can be repetitive.
• Added: Show total count of imported items.
• Added: Button for direct open of import format definition from import source window.

File:

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

trunk/UAcronym.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Contnrs, XMLConf, XMLRead, XMLWrite, DOM, UXMLUtils,
-  SpecializedList, fphttpclient;
+  SpecializedList, fphttpclient, Dialogs;
 
 type
@@ -119 +119 @@
     Variable: TImportVariable;
     Flag: TImportPatternFlag;
+    Repetition: Boolean;
     procedure Assign(Source: TImportPattern);
     procedure SaveToNode(Node: TDOMNode);
@@ -167 +168 @@
     LastTime: TDateTime;
     Sources: TImportSources;
+    ItemCount: Integer;
     function DownloadHTTP(URL: string; Stream: TStream): Boolean;
     procedure Process;
@@ -265 +267 @@
   Variable := Source.Variable;
   Flag := Source.Flag;
+  Repetition := Source.Repetition;
 end;
 
@@ -273 +276 @@
   WriteInteger(Node, 'Variable', Integer(Variable));
   WriteInteger(Node, 'Flag', Integer(Flag));
+  WriteBoolean(Node, 'Repetition', Repetition);
 end;
 
@@ -281 +285 @@
   Variable := TImportVariable(ReadInteger(Node, 'Variable', 0));
   Flag := TImportPatternFlag(ReadInteger(Node, 'Flag', 0));
+  Repetition := ReadBoolean(Node, 'Repetition', False);
 end;
 
@@ -295 +300 @@
 var
   HTTPClient: TFPHTTPClient;
+  FormData: TStringList;
 begin
   HTTPClient := TFPHttpClient.Create(nil);
   HTTPClient.OnPassword := DoPassword;
+  FormData := TStringList.Create;
+(*
+FormData.action=clientlogin
+  &loginreturnurl=http://example.com/&
+  logintoken=29590a3037d325be70b93fb8258ed29257448cfb%2B%5C&
+  username=Bob&
+  password=secret&
+  rememberMe=1
+  HTTPClient.FormPost(URL, FormData, Stream);
+  *)
   HTTPClient.Get(URL, Stream);
+  FormData.Free;
   HTTPClient.Free;
   Result := True;
@@ -502 +519 @@
   NewAcronym: TAcronymEntry;
   P: Integer;
+  P1, P2: Integer;
   Q: Integer;
   I: Integer;
@@ -507 +525 @@
   LastLength: Integer;
 begin
+  ItemCount := 0;
   Stream := TMemoryStream.Create;
   NewAcronym := TAcronymEntry.Create;
@@ -547 +566 @@
       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 Length(StartString) > 0 then begin
-            P := Pos(StartString, S);
-            if P > 0 then Delete(S, 1, P + Length(StartString) - 1);
+        I := 0;
+        while I < Format.ItemPatterns.Count do
+        with TImportPattern(Format.ItemPatterns[I]) do begin
+          if Flag <> ipfSkip then begin
+            if Length(StartString) > 0 then begin
+              P := Pos(StartString, S);
+              if P > 0 then Delete(S, 1, P + Length(StartString) - 1);
+            end;
+
+            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;
+              end;
+              Delete(S, 1, P + Length(EndString) - 1);
+
+              if (Flag = ipfNewItem) and (Trim(NewAcronym.Name) <> '') and
+                (Trim(NewAcronym.Meaning) <> '') then begin
+                  Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+                  Inc(ItemCount);
+                end;
+
+              if Repetition then begin
+                if Length(StartString) > 0 then begin
+                  P1 := Pos(StartString, S);
+                  if P1 > 0 then begin
+                    P2 := Pos(TImportPattern(Format.ItemPatterns[(I + 1) mod Format.ItemPatterns.Count]).StartString, S);
+                    if (P2 > 0) and (P1 < P2) then Continue;
+                  end;
+                end;
+              end;
+            end;
           end;
-
-          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 := Trim(T);
-            case Variable of
-              ivAcronym: NewAcronym.Name := T;
-              ivMeaning: NewAcronym.Meaning := T;
-            end;
-            Delete(S, 1, P + Length(EndString) - 1);
-
-            if (Flag = ipfNewItem) and (Trim(NewAcronym.Name) <> '') and
-              (Trim(NewAcronym.Meaning) <> '') then
-              Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
-          end;
+          Inc(I);
         end;
       until Length(S) = LastLength;