Changeset 54

Timestamp:

Jan 11, 2007, 9:08:05 PM (19 years ago)

Author:

RBRi

Message:

refactoring to simplify command line handling in MainForm
some tests fixed

Location:

trunk

Files:

• NewView/CmdLineParameterUnit.pas (modified) (2 diffs)
• NewView/MainForm.pas (modified) (6 diffs)
• NewView/StartupUnit.pas (modified) (2 diffs)
• test/tests.cmd (modified) (1 diff)

trunk/NewView/CmdLineParameterUnit.pas

@@ -74 +74 @@
 
        PROCEDURE parseCmdLine(aCmdLineString : String);
+
+       FUNCTION getInterpretedFileNames: String;
+       FUNCTION getInterpretedSearchText: String;
      private
        PROCEDURE parseSwitch(aCmdLineString : String);
   end;
 
+  FUNCTION getOwnHelpFileName: String;
+
   // returns a string containing the whole
   // command line parametes
-  FUNCTION nativeOS2GetCmdLineParameter : STRING;
+  FUNCTION nativeOS2GetCmdLineParameter : String;
 
 
 Implementation
+uses
+  ACLFileUtility;
+
+  FUNCTION TCmdLineParameters.getInterpretedFileNames: String;
+  var
+    tmpOwnHelpFileName : String;
+  begin
+    result := getFileNames;
+
+    if getGlobalSearchFlag
+       AND (getSearchText = '')
+    then
+    begin
+      result := '';
+      exit;
+    end;
+
+
+    tmpOwnHelpFileName := FindDefaultLanguageHelpFile('NewView');
+    if (result = '') AND
+      FileExists(tmpOwnHelpFileName)
+    then
+      result := tmpOwnHelpFileName;
+  end;
+
+
+  FUNCTION TCmdLineParameters.getInterpretedSearchText: String;
+  begin
+    result := getSearchText;
+
+    if getGlobalSearchFlag
+       AND (result = '')
+    then
+      result := getFileNamesRaw;
+  end;
+
 
   FUNCTION TCmdLineParameters.setHelpManagerFlag(aNewValue : boolean) : boolean;
@@ -456 +497 @@
 
 
+  FUNCTION getOwnHelpFileName: String;
+  begin
+    result := FindDefaultLanguageHelpFile('NewView');
+  end;
+
+
   FUNCTION nativeOS2GetCmdLineParameter : STRING;
   VAR

trunk/NewView/MainForm.pas

@@ -4190 +4190 @@
       LogEvent(LogStartup, 'Showing usage');
       ShowUsage;
-
-      if FileExists( GetOwnHelpFileName ) then
-        OpenFile( GetOwnHelpFileName, '', true );
-
-      exit;
     end;
   end;
@@ -4200 +4195 @@
   HelpManagerWindows.Add( pointer( CmdLineParameters.getHelpManagerWindow ) );
 
-  if CmdLineParameters.getFileNames <> '' then
+  if CmdLineParameters.getInterpretedFileNames <> '' then
   begin
     // open specified files
@@ -4206 +4201 @@
 
     // TODO use StrExtractStrings
-    StringToList(cmdLineParameters.getFileNames, Filenames, '+' );
+    StringToList(cmdLineParameters.getInterpretedFileNames, Filenames, '+' );
 
     LogEvent(LogStartup, 'Call OpenFiles');
@@ -4212 +4207 @@
     OpenFirstTopic := true;
 
-    if ( CmdLineParameters.getSearchText <> '' )
-       or CmdLineParameters.getSearchFlag then
+    if ( CmdLineParameters.getInterpretedSearchText <> '' )
+       OR CmdLineParameters.getSearchFlag
+       OR CmdLineParameters.getHelpManagerFlag
+    then
       // if we're going to search, don't open first topic
-      OpenFirstTopic := false;
-
-    if CmdLineParameters.getHelpManagerFlag then
-    begin
       // don't open first topic if we're online help
       // in case we are wanting to show a specific topic
       // - saves time/flicker
       OpenFirstTopic := false;
-    end;
-
-    if NOT (  CmdLineParameters.getGlobalSearchFlag
-              AND (CmdLineParameters.getSearchText = '')
-           )
-    then
-    begin
+
     OpenFiles( Filenames,
                CmdLineParameters.getWindowTitle,
                OpenFirstTopic );
-    end;
 
     Filenames.Destroy;
@@ -4239 +4225 @@
     if not CmdLineParameters.getSearchFlag
        and not CmdLineParameters.getGlobalSearchFlag
-       and (CmdLineParameters.getSearchText <> '') then
+       and (CmdLineParameters.getInterpretedSearchText <> '') then
     begin
       // search in contents only!
@@ -4252 +4238 @@
       DisplaySearch;
 
-      SearchFor( CmdLineParameters.getSearchText );
+      SearchFor( CmdLineParameters.getInterpretedSearchText );
     end;
   end;
 
-  if CmdLineParameters.getGlobalSearchFlag then
+  if NOT CmdLineParameters.getShowUsageFlag
+     AND CmdLineParameters.getGlobalSearchFlag then
   begin
     // Global search
-    if (CmdLineParameters.getSearchText = '')
-      AND (CmdLineParameters.getFileNamesRaw <> '')
-    then
-    begin
-      LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getFileNamesRaw );
-      DoGlobalSearch( CmdLineParameters.getFileNamesRaw );
-    end
-    else
-    begin
-      LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getSearchText );
-      DoGlobalSearch( CmdLineParameters.getSearchText );
-    end;
-  end;
-
-  if     ( length(CmdLineParameters.getFileNames) = 0 )
-     and ( not CmdLineParameters.getSearchFlag ) then
-  begin
-    // user hasn't requested any particular file
-    // at startup, so if the option is still set,
-    // load the NewView help file
-    if Settings.StartupHelp then
-      if FileExists( GetOwnHelpFileName ) then
-        OpenFile( GetOwnHelpFileName, '', true );
+    LogEvent(LogStartup, 'Do global search: ' + CmdLineParameters.getFileNamesRaw );
+    DoGlobalSearch( CmdLineParameters.getInterpretedSearchText );
   end;
 

trunk/NewView/StartupUnit.pas

@@ -27 +27 @@
 // False if it should immediately exit.
 function Startup: boolean;
-
-function GetOwnHelpFileName: string;
 
 // Look for any items that are actually specifiying environment
@@ -168 +166 @@
 end;
 
-function GetOwnHelpFileName: string;
-begin
-  Result := FindDefaultLanguageHelpFile( 'NewView' );
-end;
 
 // If another instance already has the files open

trunk/test/tests.cmd

@@ -135 +135 @@
 say "*                                                                       *"
 say "* Expected                                                              *"
-say "* NewView start and shows the 'Command Reference' help                  *"
-say "* - left navigation is shown                                            *"
-say "* - contents tab is selected                                            *"
-say "* - all contents are collapsed                                          *"
-say "* - 'Introduction' is selected and visible at the right                 *"
+say "* NewView start and shows nothing                                       *"
+say "* - left navigation is NOT shown                                        *"
 say "* - The 'Search all fieles' dialog is opend and searches for copy       *"
 say "*************************************************************************"