Changeset 98 for trunk/NewView/GlobalSearchForm.pas

Timestamp:

Mar 17, 2007, 9:50:38 PM (18 years ago)

Author:

RBRi

Message:

many small updates/commens/logging changes
fix for #16

File:

• trunk/NewView/GlobalSearchForm.pas (modified) (22 diffs)

trunk/NewView/GlobalSearchForm.pas

@@ -71 +71 @@
     Procedure ResultsOutlineOnEnter (Sender: TObject);
     Procedure SearchTextEditOnEnter (Sender: TObject);
-    Procedure ViewHelpPathsButtonOnClick (Sender: TObject);
     Procedure SelectDrivesButtonOnClick (Sender: TObject);
     Procedure GlobalSearchFormOnSetupShow (Sender: TObject);
@@ -197 +196 @@
 End;
 
-Procedure TGlobalSearchForm.ViewHelpPathsButtonOnClick (Sender: TObject);
-var
-  Dirs: TStringList;
-Begin
-  Dirs := TStringList.Create;
-
-  with InformationForm.InformationMemo do
-  begin
-    Lines.Clear;
-
-    Lines.Add( 'HELP:' );
-    GetDirsInPath( 'HELP', Dirs );
-    Lines.AddStrings( Dirs );
-
-    Lines.Add( '' );
-    Lines.Add( 'BOOKSHELF:' );
-    GetDirsInPath( 'BOOKSHELF', Dirs );
-    Lines.AddStrings( Dirs );
-  end;
-  InformationForm.ShowModal;
-
-  Dirs.Destroy;
-End;
-
-Procedure TGlobalSearchForm.GetSelectedDirectories( List: TStringList );
+
+Procedure TGlobalSearchForm.GetSelectedDirectories(List: TStringList);
 Var
+  tmpDirectories : TStringList;
+
   DriveNumber: longint;
   DriveType: TDriveType;
   DriveLetter: char;
-  Dirs: TStringList;
   i: longint;
   Dir: string;
@@ -242 +219 @@
     Ord( gsSelectedHelpPaths ): // standard or selected help paths
     Begin
-      Dirs := TStringList.Create;
+      tmpDirectories := TStringList.Create;
       List.Sorted := true;
       List.Duplicates := dupIgnore;
 
-      GetDirsInPath( 'HELP', Dirs );
-      List.AddStrings( Dirs );
-
-      GetDirsInPath( 'BOOKSHELF', Dirs );
-      List.AddStrings( Dirs );
-
-      Dirs.Destroy;
-
+      // GetDirsInPath clears the list tmpDirectories
+      GetDirsInPath(HelpPathEnvironmentVar, tmpDirectories);
+      List.AddStrings(tmpDirectories);
+
+      GetDirsInPath(BookshelfEnvironmentVar, tmpDirectories);
+      List.AddStrings(tmpDirectories);
+
+      tmpDirectories.Destroy;
+
+      // for selected paths we have to adjust the selection
       if SearchLocationComboBox.ItemIndex = Ord( gsSelectedHelpPaths ) then
       begin
@@ -259 +238 @@
         for i := 0 to List.Count - 1 do
         begin
-          Dir := List[ i ];
+          Dir := List[i];
           if not Settings.SearchDirectories.Find( Dir, FoundIndex ) then
-            List.Objects[ i ] := pointer( 1 );
+            List.Objects[i] := pointer(1);
         end;
       end;
     end;
+
 
     Ord( gsFixedDrives ):
@@ -284 +264 @@
     begin
       // already custom...
-      List.Assign( Settings.SearchDirectories );
+      List.Assign(Settings.SearchDirectories);
     end;
   end;
@@ -290 +270 @@
 
 Procedure TGlobalSearchForm.SelectDrivesButtonOnClick (Sender: TObject);
-Begin
-  GetSelectedDirectories( SearchDirectoriesForm.SelectedFolders );
+begin
+  GetSelectedDirectories(SearchDirectoriesForm.SelectedFolders);
 
   SearchDirectoriesForm.ShowModal;
@@ -297 +277 @@
     exit;
 
+  // there was a selection, so we have to change the dropdown
   if SearchLocationComboBox.ItemIndex = Ord( gsHelpPaths ) then
     SearchLocationComboBox.ItemIndex := Ord( gsSelectedHelpPaths );
@@ -306 +287 @@
     SearchLocationComboBox.ItemIndex := Ord( gsCustom );
 
+  // update the settings
   Settings.SearchDirectories.Assign( SearchDirectoriesForm.SelectedFolders );
-
   SaveSettings;
 End;
@@ -477 +458 @@
 Function TGlobalSearchForm.Search( Parameters: TObject ): TObject;
 var
-  Files: TStringList;
+  Files : TStringList;
   FileIndex: longint;
   Filename: string;
@@ -484 +465 @@
   MatchingTopics: TList;
 
-  SearchParameters: TSearchParameters;
+  tmpSearchParameters : TSearchParameters;
   Query: TTextSearchQuery;
   i: longint;
@@ -490 +471 @@
 
 Begin
-//  StartProfile( GetLogFilesDir + 'NewViewSearch.prf' );
-
-  SearchParameters := Parameters as TSearchParameters;
-
-  Query := SearchParameters.Query;
+  tmpSearchParameters := Parameters as TSearchParameters;
+
+  Query := tmpSearchParameters.Query;
   Files := TStringList.Create;
 
-  // MatchingTopics.Add( nil ); // artificial crash
   MatchingTopics := TList.Create;
-
-  LogEvent(LogParse, 'Getting files');
+  LogEvent(LogParse, 'Creating file list');
 
   // make sure we ignore duplicate files...
@@ -507 +484 @@
   Files.Duplicates := dupIgnore;
 
-  for i := 0 to SearchParameters.Directories.Count - 1 do
+  for i := 0 to tmpSearchParameters.Directories.Count - 1 do
   begin
     if ThreadManager.StopRequested then
+    begin
       break;
-    ThreadManager.UpdateProgress( i * 10 div SearchParameters.Directories.Count,
+    end;
+
+    ThreadManager.UpdateProgress( i * 10 div tmpSearchParameters.Directories.Count,
                                   100,
                                   ScanDirectoriesMsg );
-    Dir := SearchParameters.Directories[ i ];
+    Dir := tmpSearchParameters.Directories[ i ];
     if StrEnds( '...', Dir ) then
     begin
@@ -521 +501 @@
                                        Dir,
                                        '*.inf;*.hlp',
+                                       true,
                                        Files,
                                        ThreadManager.StopRequested,
@@ -527 +508 @@
     else
     begin
-      ListFilesInDirectory( Dir,
-                            '*.inf;*.hlp',
-                            Files);
-    end;
-  end;
-
-  LogEvent(LogParse, ' Searching ' + IntToStr( Files.Count ) + ' files');
+      ListFilesInDirectory( Dir, '*.inf;*.hlp', true, Files);
+    end;
+  end;
+
   for FileIndex := 0 to Files.Count - 1 do
   begin
     if ThreadManager.StopRequested then
+    begin
       break;
-    Filename := Files[ FileIndex ];
-    LogEvent(LogParse, Filename);
+    end;
+
+    Filename := Files[FileIndex];
+
     ThreadManager.UpdateProgress( 10 + FileIndex * 95 div Files.Count,
                                   100,
@@ -551 +532 @@
 
     try
-      LogEvent(LogParse, ' Create THelpFile');
       HelpFile := THelpFile.Create( FileName );
-
-      LogEvent(LogParse, ' Helpfile created');
       MatchingTopics.Clear;
-
-      LogEvent(LogParse, ' Search file');
       SearchHelpFile( HelpFile,
                       Query,
@@ -566 +542 @@
       if MatchingTopics.Count > 0 then
       begin
-        LogEvent(LogParse, '  Sort results');
         // Create a searchresult object to send back to main thread.
         SearchResult := TSearchResult.Create;
@@ -575 +550 @@
 
         SearchResult.MatchingTopics.Sort( TopicRelevanceCompare );
-        LogEvent(LogParse, '  Display results');
-
         ThreadManager.SendData( '', SearchResult );
       end;
 
-      LogEvent(LogParse, 'Unload helpfile');
       HelpFile.Destroy;
 
@@ -596 +568 @@
 
   end;
-  LogEvent(LogParse, 'search completed');
   ThreadManager.UpdateProgress( 100, 100, DoneMsg );
   Files.Destroy;
@@ -602 +573 @@
   Query.Destroy;
 
-  SearchParameters.Directories.Destroy;
-  SearchParameters.Destroy;
+  tmpSearchParameters.Directories.Destroy;
+  tmpSearchParameters.Destroy;
 
   Result := nil;
-  LogEvent(LogParse, 'done');
 End;
 
@@ -626 +596 @@
 Procedure TGlobalSearchForm.DoSearch;
 var
+  tmpSelectedDirectories : TStringList;
+  i : integer;
+
   SearchText: string;
   Query: TTextSearchQuery;
@@ -641 +614 @@
 
   try
-    Query := TTextSearchQuery.Create( SearchText );
+    Query := TTextSearchQuery.Create(SearchText);
   except
     on e: ESearchSyntaxError do
@@ -655 +628 @@
 
   SearchParameters := TSearchParameters.Create;
+
+  SearchParameters.Query := Query;
+
+  // now the directories to search in
   SearchParameters.Directories := TStringList.Create;
 
-  SearchParameters.Query := Query;
-
-  GetSelectedDirectories( SearchParameters.Directories );
+  tmpSelectedDirectories := TStringList.Create;
+  GetSelectedDirectories(tmpSelectedDirectories);
+
+  // clear the list and add only the selected ones
+  for i := 0 to tmpSelectedDirectories.Count - 1 do
+  begin
+    if tmpSelectedDirectories.Objects[i] = nil then
+    begin
+      SearchParameters.Directories.add(tmpSelectedDirectories[i]);
+    end;
+  end;
+  tmpSelectedDirectories.Destroy;
 
   ThreadManager.StartJob( Search, SearchParameters );