mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-03 22:20:17 +02:00
wiki test: show loaded time if search empty
git-svn-id: trunk@35765 -
This commit is contained in:
parent
770879293e
commit
afcca990e6
@ -1341,39 +1341,39 @@ begin
|
||||
finally
|
||||
LeaveCritSect;
|
||||
end;
|
||||
exit;
|
||||
end else begin
|
||||
StartTime:=Now;
|
||||
//debugln(['TWikiHelp.DoSearch START Search=',Trim(Query.Phrases.Text)]);
|
||||
FoundPages:=nil;
|
||||
Converter.Search(Query,Scoring,FoundPages);
|
||||
HTML:='<html>'+LineEnding
|
||||
+'<head>'+LineEnding
|
||||
+' <meta content="text/html; charset=utf-8" http-equiv="Content-Type">'+LineEnding;
|
||||
if ResultsCSSURL<>'' then
|
||||
HTML+=' <link href="'+ResultsCSSURL+'" type="text/css" rel="stylesheet">'+LineEnding;
|
||||
HTML+='</head>'+LineEnding
|
||||
+'<body>'+LineEnding;
|
||||
for i:=0 to Min(FoundPages.Count-1,MaxResults) do begin
|
||||
Page:=TW2HelpPage(FoundPages[i]);
|
||||
Node:=Page.GetNodeHighestScore(Query,Scoring);
|
||||
s:='<div class="wikiSearchResultItem">'+FoundNodeToHTMLSnippet(Page,Node,Query)+'</div>'+LineEnding;
|
||||
//debugln(['TWikiHelp.TestSearch Score=',Page.Score,' HTML="',s,'"']);
|
||||
HTML+=s;
|
||||
end;
|
||||
HTML+='</body>'+LineEnding
|
||||
+'</html>'+LineEnding;
|
||||
FResultsHTML:=HTML;
|
||||
FoundPages.Free;
|
||||
EndTime:=Now;
|
||||
fWikiSearchTimeMSec:=round(Abs(EndTime-StartTime)*86400000);
|
||||
EnterCritSect;
|
||||
try
|
||||
fProgressStep:=whpsWikiSearchComplete;
|
||||
finally
|
||||
LeaveCritSect;
|
||||
end;
|
||||
//debugln(['TWikiHelp.DoSearch END Search="',Trim(Query.Phrases.Text),'" ',dbgs(fWikiSearchTimeMSec)+'msec']);
|
||||
end;
|
||||
StartTime:=Now;
|
||||
//debugln(['TWikiHelp.DoSearch START Search=',Trim(Query.Phrases.Text)]);
|
||||
FoundPages:=nil;
|
||||
Converter.Search(Query,Scoring,FoundPages);
|
||||
HTML:='<html>'+LineEnding
|
||||
+'<head>'+LineEnding
|
||||
+' <meta content="text/html; charset=utf-8" http-equiv="Content-Type">'+LineEnding;
|
||||
if ResultsCSSURL<>'' then
|
||||
HTML+=' <link href="'+ResultsCSSURL+'" type="text/css" rel="stylesheet">'+LineEnding;
|
||||
HTML+='</head>'+LineEnding
|
||||
+'<body>'+LineEnding;
|
||||
for i:=0 to Min(FoundPages.Count-1,MaxResults) do begin
|
||||
Page:=TW2HelpPage(FoundPages[i]);
|
||||
Node:=Page.GetNodeHighestScore(Query,Scoring);
|
||||
s:='<div class="wikiSearchResultItem">'+FoundNodeToHTMLSnippet(Page,Node,Query)+'</div>'+LineEnding;
|
||||
//debugln(['TWikiHelp.TestSearch Score=',Page.Score,' HTML="',s,'"']);
|
||||
HTML+=s;
|
||||
end;
|
||||
HTML+='</body>'+LineEnding
|
||||
+'</html>'+LineEnding;
|
||||
FResultsHTML:=HTML;
|
||||
FoundPages.Free;
|
||||
EndTime:=Now;
|
||||
fWikiSearchTimeMSec:=round(Abs(EndTime-StartTime)*86400000);
|
||||
EnterCritSect;
|
||||
try
|
||||
fProgressStep:=whpsWikiSearchComplete;
|
||||
finally
|
||||
LeaveCritSect;
|
||||
end;
|
||||
//debugln(['TWikiHelp.DoSearch END Search="',Trim(Query.Phrases.Text),'" ',dbgs(fWikiSearchTimeMSec)+'msec']);
|
||||
if Assigned(OnSearched) then
|
||||
OnSearched(Self);
|
||||
end;
|
||||
|
@ -245,9 +245,7 @@ begin
|
||||
UpdateProgress;
|
||||
|
||||
HTML:=WikiHelp.ResultsHTML;
|
||||
if HTML='' then begin
|
||||
HTML:='<html><body><h1>Search Results</h1></body></html>';
|
||||
end;
|
||||
if HTML='' then exit;
|
||||
LoadHTML(ResultsIpHtmlPanel,HTML);
|
||||
end;
|
||||
|
||||
@ -260,6 +258,8 @@ begin
|
||||
NewLanguages:=UTF8Trim(LanguagesEdit.Text);
|
||||
if (NewSearchText=fLastSearchText) and (NewLanguages=fLastLanguages) then
|
||||
exit;
|
||||
fLastSearchText:=NewSearchText;
|
||||
fLastLanguages:=NewLanguages;
|
||||
WikiHelp.Search(NewSearchText,NewLanguages);
|
||||
Timer1.Enabled:=true;
|
||||
end;
|
||||
|
Loading…
Reference in New Issue
Block a user