Changeset 43 for trunk/NewView/StartupUnit.pas

Timestamp:

Jan 2, 2007, 8:29:54 PM (19 years ago)

Author:

RBRi

Message:

% use new debug unit

File:

• trunk/NewView/StartupUnit.pas (modified) (8 diffs)

trunk/NewView/StartupUnit.pas

@@ -50 +50 @@
   Dos,
   SysUtils,
+  DebugUnit,
   PMWin,
   ACLUtility,
@@ -55 +56 @@
   ACLFileUtility,
   AStringUtilityUnit,
-  ACLProfile,
   HelpManagerUnit;
 
@@ -67 +67 @@
   EnvironmentVarValue: string;
 begin
-  ProfileEvent( 'Translating environment vars' );
+  LogEvent(LogStartup, 'Translating environment vars' );
   for i := 0 to Items.Count - 1 do
   begin
@@ -75 +75 @@
     Item := StrUnDoubleQuote( Item ); // remove double quotes
 
-    ProfileEvent( '  Item: ' + Item );
+    LogEvent(LogStartup, '  Item: ' + Item );
     EnvironmentVarValue := GetEnv( Uppercase( Item ) );
     if DosError = 0 then
     begin
       // environment var exists - use it's value
-      ProfileEvent( '    Translated: ' + EnvironmentVarValue );
+      LogEvent(LogStartup, '    Translated: ' + EnvironmentVarValue );
       while EnvironmentVarValue <> '' do
       begin
@@ -251 +251 @@
   Filenames := TStringList.Create;
 
-  StringToList(cmdLineParameters.getFileNames, FileItems, '+' );
+  StringToList(CmdLineParameters.getFileNames, FileItems, '+' );
   TranslateIPFEnvironmentVars( FileItems, FileNames );
 
@@ -320 +320 @@
 var
   tmpCmdLine: String;
-  tmpSplittedCmdLine : TStringList;
   tmpRc : Integer;
 
@@ -333 +332 @@
   // parse parameters into Parameters object
   tmpCmdLine := nativeOS2GetCmdLineParameter;
-  tmpSplittedCmdLine := TStringList.Create;
-  tmpRc := splitCmdLineParameter(tmpCmdLine, tmpSplittedCmdLine);
 
   CmdLineParameters := TCmdLineParameters.Create;
-  CmdLineParameters.parseCmdLine(tmpSplittedCmdLine);
-
-  tmpSplittedCmdLine.Destroy;
+  CmdLineParameters.parseCmdLine(tmpCmdLine);
 
   ExistingWindow := FindExistingWindow;
@@ -355 +350 @@
     WinSetFocus( HWND_DESKTOP, ExistingWindow );
 
-    if CmdLineParameters.getTopics <> '' then
+    // if CmdLineParameters.getTopics <> '' then
+    if not CmdLineParameters.getSearchFlag AND not CmdLineParameters.getGlobalSearchFlag then
     begin
       PostNewViewTextMessage( ExistingWindow,
                               NHM_SEARCH,
-                              CmdLineParameters.getTopics);
-    end;
-
-    if CmdLineParameters.getGlobalSearchTextFlag then
+                              CmdLineParameters.getSearchText);
+    end;
+
+    if CmdLineParameters.getGlobalSearchFlag then
     begin
       PostNewViewTextMessage( ExistingWindow,
                               NHM_GLOBAL_SEARCH,
-                              CmdLineParameters.getGlobalSearchText );
+                              CmdLineParameters.getSearchText );
     end;