Changeset 25 for trunk/UAcronym.pas

Timestamp:

May 8, 2016, 10:56:38 PM (9 years ago)

Author:

chronos

Message:

• Added: Use block start/end for source import format parsing.

File:

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

trunk/UAcronym.pas

@@ -120 +120 @@
     Id: Integer;
     Name: string;
+    Block: TImportPattern;
     Acronym: TImportPattern;
     Meaning: TImportPattern;
@@ -233 +234 @@
 begin
   Name := Source.Name;
+  Block.StartString := Source.Block.StartString;
+  Block.EndString := Source.Block.EndString;
   Acronym.StartString := Source.Acronym.StartString;
   Acronym.EndString := Source.Acronym.EndString;
@@ -245 +248 @@
   WriteInteger(Node, 'Id', Id);
   WriteString(Node, 'Name', Name);
+  WriteString(Node, 'BlockStartString', Block.StartString);
+  WriteString(Node, 'BlockEndString', Block.EndString);
   WriteString(Node, 'AcronymStartString', Acronym.StartString);
   WriteString(Node, 'AcronymEndString', Acronym.EndString);
@@ -257 +262 @@
   Id := ReadInteger(Node, 'Id', 0);
   Name := ReadString(Node, 'Name', '');
+  Block.StartString := ReadString(Node, 'BlockStartString', '');
+  Block.EndString := ReadString(Node, 'BlockEndString', '');
   Acronym.StartString := ReadString(Node, 'AcronymStartString', '');
   Acronym.EndString := ReadString(Node, 'AcronymEndString', '');
@@ -385 +392 @@
   NewAcronym: TAcronymEntry;
   P: Integer;
+  NewName: string;
 begin
   Stream := TMemoryStream.Create;
@@ -393 +401 @@
       SetLength(S, Stream.Size);
       Stream.Read(S[1], Length(S));
+      if Format.Block.StartString <> '' then begin
+        P := Pos(Format.Block.StartString, S);
+        if P > 0 then
+          Delete(S, 1, P + Length(Format.Block.StartString) - 1);
+      end;
+      if Format.Block.EndString <> '' then begin
+        P := Pos(Format.Block.EndString, S);
+        if P > 0 then
+          Delete(S, P, Length(S));
+      end;
+
       repeat
         P := Pos(Format.Acronym.StartString, S);
@@ -399 +418 @@
           Delete(S, 1, P + Length(Format.Acronym.StartString) - 1);
           P := Pos(Format.Acronym.EndString, S);
-          NewAcronym.Name := Trim(StripHTML(Copy(S, 1, P - 1)));
+          NewName := Trim(StripHTML(Copy(S, 1, P - 1)));
+          if NewName <> '' then NewAcronym.Name := NewName;
           Delete(S, 1, P + Length(Format.Acronym.EndString) - 1);