paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 10:22:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed search results so that the modified pages are valid html

Browse Source 
added exception handling in case the fcl html parser cannot read the html

git-svn-id: trunk@26973 -
This commit is contained in:
andrew 2010-08-02 02:44:02 +00:00
parent 6df88c414f
commit 1952bfcff4
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/chmhelp/lhelp/chmcontentprovider.pas
View File

@ -111,7 +111,7 @@ type
implementation
uses ChmSpecialParser{$IFDEF CHM_SEARCH}, chmFIftiMain{$ENDIF}, chmsitemap, LCLType, SAX_HTML, Dom, XMLWrite, DOM_HTML;
uses ChmSpecialParser{$IFDEF CHM_SEARCH}, chmFIftiMain{$ENDIF}, chmsitemap, LCLType, SAX_HTML, Dom, XMLWrite, DOM_HTML, HTMWrite;
type
@ -386,27 +386,44 @@ var
NewStream: TMemoryStream;
Highlighter: THTMLWordHighlighter;
Words: TStringList;
UseOrigStream: Boolean;
begin
if not FLoadingSearchURL then
Exit;
// load html and add tags to highlight words then save back to stream
NewStream := TMemoryStream.Create;
ReadHTMLFile(Doc, AStream);
Words := TStringList.Create;
Words.Delimiter:=' ';
Words.DelimitedText:=fKeywordCombo.Text;
Highlighter := THTMLWordHighlighter.Create(Doc);
Highlighter.HighlightWords(Words, 'red');
HighLighter.Free;
try
UseOrigStream := True;
ReadHTMLFile(Doc, AStream);
Highlighter := THTMLWordHighlighter.Create(Doc);
Highlighter.HighlightWords(Words, 'red');
WriteHTMLFile(Doc, NewStream);
UseOrigStream := False;
finally
try
Doc.Free;
Highlighter.Free;
finally
end;
end;
Words.Free;
WriteXMLFile(Doc, NewStream);
AStream.Free;
AStream := NewStream;
NewStream.Position:=0;
if not UseOrigStream then
begin
AStream.Free;
AStream := NewStream;
NewStream.Position:=0;
end
else
NewStream.Free;
AStream.Position := 0;
end;
procedure TChmContentProvider.FillTOC(Data: PtrInt);