wiki test: progress label

git-svn-id: trunk@35742 -
This commit is contained in:
mattias 2012-03-05 16:53:33 +00:00
parent dbab7ecefd
commit d26eae6e92
2 changed files with 12 additions and 0 deletions

View File

@ -1086,7 +1086,11 @@ begin
end;
procedure TWiki2HelpConverter.LoadPages;
var
s: TDateTime;
e: TDateTime;
begin
s:=Now;
Help.EnterCritSect;
try
Help.fProgressStep:=whpsWikiLoadPages;
@ -1096,6 +1100,8 @@ begin
Help.LeaveCritSect;
end;
ProcThreadPool.DoParallel(@ParallelLoadPage,0,(Count-1) div PagesPerThread);
e:=Now;
debugln(['TWiki2HelpConverter.LoadPages ',round((e-s)*86400000)]);
end;
constructor TWiki2HelpConverter.Create;
@ -1140,6 +1146,7 @@ begin
try
Help.Converter.OnLog:=@ConverterLog;
// get all wiki xml files
Log('TWikiHelpThread.Execute AAA1');
if FindFirstUTF8(Help.XMLDirectory+AllFilesMask,faAnyFile,FileInfo)=0 then begin
repeat
if CompareFileExt(FileInfo.Name,'.xml',false)<>0 then continue;
@ -1150,6 +1157,7 @@ begin
until FindNextUTF8(FileInfo)<>0;
end;
FindCloseUTF8(FileInfo);
Log('TWikiHelpThread.Execute AAA2');
// add file names to converter
for i:=0 to Files.Count-1 do begin
@ -1157,6 +1165,7 @@ begin
Help.Converter.AddWikiPage(Filename,false);
end;
if Help.Aborting then exit;
Log('TWikiHelpThread.Execute AAA3');
// load xml files
Help.Converter.LoadPages;

View File

@ -71,6 +71,8 @@ begin
WikiHelp.OnSearched:=@WikiHelpSearched;
WikiHelp.StartLoading;
UpdateProgress;
Timer1.Enabled:=true;
end;
procedure TWikiSearchDemoForm.FormDestroy(Sender: TObject);
@ -97,6 +99,7 @@ end;
procedure TWikiSearchDemoForm.Timer1Timer(Sender: TObject);
begin
ProgressLabel.Caption:=WikiHelp.GetProgressCaption;
debugln(['TWikiSearchDemoForm.Timer1Timer ',ProgressLabel.Caption]);
Timer1.Enabled:=WikiHelp.Busy;
end;