Changeset 24

Timestamp:

May 5, 2016, 12:09:19 AM (8 years ago)

Author:

chronos

Message:

• Modified: Better import source parsing.

Location:

trunk

Files:

• Example acronyms.adp (modified) (2 diffs)
• UAcronym.pas (modified) (2 diffs)

trunk/Example acronyms.adp

@@ -860 +860 @@
       <DescriptionEndString/>
     </ImportFormat>
+    <ImportFormat>
+      <Id>3</Id>
+      <Name>MediaWiki 2</Name>
+      <AcronymStartString>&lt;li&gt;</AcronymStartString>
+      <AcronymEndString>—</AcronymEndString>
+      <MeaningStartString/>
+      <MeaningEndString>&lt;/li&gt;</MeaningEndString>
+      <DescriptionStartString/>
+      <DescriptionEndString/>
+    </ImportFormat>
   </ImportFormats>
   <ImportSources>
@@ -872 +882 @@
       <ImportFormat>2</ImportFormat>
     </ImportSource>
+    <ImportSource>
+      <Name>Wikipedia - List of energy abbreviations</Name>
+      <URL>https://en.wikipedia.org/wiki/List_of_energy_abbreviations</URL>
+      <ImportFormat>3</ImportFormat>
+    </ImportSource>
   </ImportSources>
 </AcronymDecoderProject>

trunk/UAcronym.pas

@@ -217 +217 @@
   while (TagBegin > 0) do begin  // while there is a < in S
     TagEnd := Pos('>', S);              // find the matching >
-    TagLength := TagEnd - TagBegin + 1;
-    Delete(S, TagBegin, TagLength);     // delete the tag
-    TagBegin:= Pos( '<', S);            // search for next <
+    if TagEnd = 0 then TagLength := Length(S) - TagBegin
+      else TagLength := TagEnd - TagBegin + 1;
+    if TagLength > 0 then
+      Delete(S, TagBegin, TagLength)     // delete the tag
+      else Delete(S, 1, TagEnd);     // delete the tag
+    TagBegin := Pos( '<', S);            // search for next <
   end;
 
@@ -400 +403 @@
 
           // Meaning
-          P := Pos(Format.Meaning.StartString, S);
-          Delete(S, 1, P + Length(Format.Meaning.StartString) - 1);
+          if Length(Format.Meaning.StartString) > 0 then begin
+            P := Pos(Format.Meaning.StartString, S);
+            Delete(S, 1, P + Length(Format.Meaning.StartString) - 1);
+          end;
           P := Pos(Format.Meaning.EndString, S);
           NewAcronym.Meaning := Trim(StripHTML(Copy(S, 1, P - 1)));