Changeset 313

Timestamp:

Jul 31, 2008, 8:51:49 PM (17 years ago)

Author:

RBRi

Message:

fix for #38

File:

• branches/2.19_branch/NewView/GlobalSearchForm.pas (modified) (7 diffs)

branches/2.19_branch/NewView/GlobalSearchForm.pas

@@ -108 +108 @@
 
   protected
-    Procedure OnLanguageEvent( Language: TLanguageFile;
-                               const Apply: boolean );
+    Procedure OnLanguageEvent( Language: TLanguageFile; const Apply: boolean );
 
     SearchCaption: string;
@@ -468 +467 @@
   Query: TTextSearchQuery;
   i: longint;
-  Dir: string;
-
-Begin
+  tmpDir: string;
+
+Begin
+  // LogEvent(LogDebug, 'TGlobalSearchForm.Search');
+
   tmpSearchParameters := Parameters as TSearchParameters;
 
@@ -491 +492 @@
     end;
 
-    ThreadManager.UpdateProgress( i * 10 div tmpSearchParameters.Directories.Count,
-                                  100,
-                                  ScanDirectoriesMsg );
-    Dir := tmpSearchParameters.Directories[ i ];
-    if StrEndsWith('...', Dir) then
-    begin
-      Dir := StrLeftWithout( Dir, 3 );
+    ThreadManager.UpdateProgress( i * 10 div tmpSearchParameters.Directories.Count, 100, ScanDirectoriesMsg );
+    tmpDir := tmpSearchParameters.Directories[i];
+    // LogEvent(LogDebug, 'TGlobalSearchForm.Search in dir: ' + tmpDir);
+    if StrEndsWith(tmpDir, '...') then
+    begin
+      tmpDir := StrLeftWithout(tmpDir, 3 );
       ListFilesInDirectoryRecursiveWithTermination(
-                                       Dir,
+                                       tmpDir,
                                        '*.inf;*.hlp',
                                        true,
@@ -508 +508 @@
     else
     begin
-      ListFilesInDirectory( Dir, '*.inf;*.hlp', true, Files);
+      ListFilesInDirectory( tmpDir, '*.inf;*.hlp', true, Files);
     end;
   end;
@@ -598 +598 @@
   tmpSelectedDirectories : TStringList;
   i : integer;
-
-  SearchText: string;
+  tmpSearchText: string;
+
   Query: TTextSearchQuery;
   SearchParameters: TSearchParameters;
 Begin
+  // LogEvent(LogDebug, 'DoSearch');
+
   if ThreadManager.IsRunning then
   begin
@@ -609 +611 @@
   end;
 
-  SearchText := trim( SearchTextEdit.Text );
-  if SearchText = '' then
+  tmpSearchText := trim( SearchTextEdit.Text );
+  if tmpSearchText = '' then
     exit;
 
+  // LogEvent(LogDebug, 'DoSearch: ' + tmpSearchText);
   try
-    Query := TTextSearchQuery.Create(SearchText);
+    Query := TTextSearchQuery.Create(tmpSearchText);
   except
     on e: ESearchSyntaxError do
@@ -636 +639 @@
   tmpSelectedDirectories := TStringList.Create;
   GetSelectedDirectories(tmpSelectedDirectories);
+
+  LogEvent(LogDebug, 'DoSearch: tmpSelectedDirectories.Count ' + IntToStr(tmpSelectedDirectories.Count));
 
   // clear the list and add only the selected ones