Ignore:
Timestamp:
Jan 27, 2010, 12:14:12 PM (14 years ago)
Author:
Kevin Toppenberg
Message:

Fixed HTML Linked Template-Note Issue

File:
1 edited

Legend:

Unmodified
Added
Removed

  • cprs/branches/tmg-cprs/CPRS-Chart/rHTMLTools.pas

    r671 r686  
    4646       fTMGPrintingAnimation,
    4747       ExtCtrls,
     48       fTemplateDialog,
    4849       StrUtils;
    4950
    … …  
    286287  function IsHTML(Line : String): boolean;
    287288  {Purpose: To look at the Text and determine if it is an HTML document.
    288    Test used: if document contains <!DOCTYPE HTML" or <HTML> or </BODY>
     289   Test used: if document contains <!DOCTYPE HTML" or <HTML> or </BODY> or other tags
    289290        This is not a fool-proof test...                                   
    290291   NOTE: **This does NOT call ScanForSubs as the other IsHTML(TStrings) function does.     }
    291        
     292
    292293  begin
    293294    Result := false;  //default of false
    294295    Line := UpperCase(Line);
    295296    if (Pos('<!DOCTYPE HTML',Line) > 0)
    296       or (Pos('<HTML>',Line) > 0)
     297      or (Pos('<HTML>',Line) > 0)
     298      or (Pos('<BR>',Line) > 0)
     299      or (Pos(fTemplateDialog.HTMLBEGINNINGTAG,Line) > 0)
     300      or (Pos('<P>',Line) > 0)
     301      or (Pos('&NBSP',Line) > 0)
    297302      or (Pos('</BODY>',Line) > 0)then begin
    298303      Result := true;
    … …  
    522527      for i := EndHTMLLine+1 to Lines.Count-1 do Lines.Delete(EndHTMLLine+1);
    523528    end;
    524   end; 
     529  end;
    525530
    526531  Function FixHTMLCRLF(Text : String) : string;
    … …  
    529534    Result := AnsiReplaceText(Result,'>'+CRLF,'>'#$1F); //protect sequences we want
    530535    Result := AnsiReplaceText(Result,CRLF,'<BR>'+CRLF); //Add <BR>'s to CrLf's
    531     Result := AnsiReplaceText(Result,'>'#$1F,'>'+CRLF); //Restore sequences we wanted
     536    Result := AnsiReplaceText(Result,'>'#$1F,'><BR>'+CRLF); //Restore sequences we wanted
    532537    Result := AnsiReplaceText(Result,#$1E,'<NO DATA>'); //Restore sequences we wanted
    533538  end;
Note: See TracChangeset for help on using the changeset viewer.