Changeset 353

Timestamp:

Jun 12, 2009, 8:24:30 AM (16 years ago)

Author:

RBRi

Message:

more logging

File:

• trunk/NewView/ViewStub.pas (modified) (4 diffs)

trunk/NewView/ViewStub.pas

@@ -57 +57 @@
   Function FindExistingWindow(aCmdLineParameters : TCmdLineParameters) : HWND;
   var
-    tmpFileItems: TStringList;
     tmpFilenames: TStringList;
     tmpFullFilePath: string;
     i: longint;
-
-    FileWindow: HWND;
+    tmpFileWindow: HWND;
+
   begin
     result := NULLHANDLE;
 
-    if aCmdLineParameters.getFileNames(false) = '' then
+    if aCmdLineParameters.getFileNames(true) = '' then
+    begin
       // not loading files; nothing to check
       exit;
-
-    tmpFileItems := TStringList.Create;
+    end;
+
     tmpFilenames := TStringList.Create;
 
-    StrExtractStrings(tmpFileItems, aCmdLineParameters.getFileNames(false), [HELP_FILE_DELIMITER], #0);
-    TranslateIPFEnvironmentVars(tmpFileItems, tmpFileNames );
+    ParseAndExpandFileNames(aCmdLineParameters.getFileNames(true), tmpFilenames);
 
     for i := 0 to tmpFileNames.Count - 1 do
     begin
-      tmpFullFilePath := FindHelpFile( tmpFilenames[ i ] );
+      LogEvent(LogStartup, 'Search in GlobalFileList for ''' + tmpFilenames[i] + '''');
+
+      tmpFullFilePath := FindHelpFile( tmpFilenames[i] );
       if tmpFullFilePath <> '' then
       begin
-        FileWindow := GlobalFilelist.FindFile(tmpFullFilePath);
-
-        if FileWindow = NULLHANDLE then
+        tmpFileWindow := GlobalFilelist.FindFile(tmpFullFilePath);
+
+        if tmpFileWindow = NULLHANDLE then
         begin
           // not found - stop searching.
@@ -91 +92 @@
 
         // found it
+        LogEvent(LogStartup, 'Found in GlobalFileList for ''' + tmpFullFilePath + '''');
 
         // is it the same as any previous match?
         if Result <> NULLHANDLE then
         begin
-          if FileWindow <> Result then
+          if tmpFileWindow <> Result then
           begin
             // no, so we don't have a match.
@@ -107 +109 @@
         begin
           // no match yet - store this one
-          result := FileWindow;
+          result := tmpFileWindow;
         end;
       end;
@@ -113 +115 @@
 
     tmpFilenames.Destroy;
-    tmpFileItems.Destroy;
   end;