From d26eae6e922e6443362f605fd89fd263e44964fe Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 5 Mar 2012 16:53:33 +0000
Subject: [PATCH] wiki test: progress label

git-svn-id: trunk@35742 -
---
 components/wiki/test/wikihelpmanager.pas | 9 +++++++++
 components/wiki/test/wikisearchmain.pas  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/components/wiki/test/wikihelpmanager.pas b/components/wiki/test/wikihelpmanager.pas
index 12ded9e356..60e847e144 100644
--- a/components/wiki/test/wikihelpmanager.pas
+++ b/components/wiki/test/wikihelpmanager.pas
@@ -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;
diff --git a/components/wiki/test/wikisearchmain.pas b/components/wiki/test/wikisearchmain.pas
index de95139002..460fbfa848 100644
--- a/components/wiki/test/wikisearchmain.pas
+++ b/components/wiki/test/wikisearchmain.pas
@@ -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;