Changeset 342

Timestamp:

Jun 1, 2009, 2:42:16 PM (16 years ago)

Author:

RBRi

Message:

index is a real object now
support for env variables to make glossary simulation work

Location:

trunk/NewView

Files:

• CmdLineParameterUnit.pas (modified) (2 diffs)
• HelpFile.pas (modified) (15 diffs)
• MainForm.pas (modified) (33 diffs)
• SearchUnit.pas (modified) (1 diff)
• StartupUnit.pas (modified) (3 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -86 +86 @@
   end;
 
+
+  // add all file name parts of aFileNameString to the result
+  // check for containing environment vars
+  // and include all help files if the environment var points
+  // to a directory
+  PROCEDURE ParseAndExpandFileNames(const aFileNameString: String; aResult: TStrings );
+
+
   // returns a string containing the whole
   // command line parametes
@@ -680 +688 @@
 
 
+  PROCEDURE ParseAndExpandFileNames(const aFileNameString : String; aResult: TStrings);
+  var
+    i : longint;
+    tmpFileNamesList: TStringList;
+    tmpItem: String;
+    tmpEnvironmentVarValue: string;
+  begin
+    LogEvent(LogDebug, 'ParseAndExpandFileNames "' + aFileNameString + '"');
+
+    tmpFileNamesList := TStringList.Create;
+
+    StrExtractStrings(tmpFileNamesList, aFileNameString, [HELP_FILE_DELIMITER, PATH_SEPARATOR], #0);
+    for i := 0 to tmpFileNamesList.Count - 1 do
+    begin
+      tmpItem := tmpFileNamesList[i];
+
+      // is this a environment var
+      tmpEnvironmentVarValue := GetEnv(tmpItem);
+      if DosError = 0 then
+      begin
+        // environment var exists
+        LogEvent(LogStartup, '    Environment var found; translated to: "' + tmpEnvironmentVarValue + '"');
+        ParseAndExpandFileNames(tmpEnvironmentVarValue, aResult);
+      end
+      else if DirectoryExists(tmpItem) then
+      begin
+        ListFilesInDirectory(tmpItem, '*' + HELP_FILE_EXTENSION, true, aResult);
+      end
+      else
+      begin
+        aResult.Add(tmpItem);
+      end;
+    end;
+
+    tmpFileNamesList.Destroy;
+  end;
+
+
   FUNCTION nativeOS2GetCmdLineParameter : AnsiString;
   VAR

trunk/NewView/HelpFile.pas

@@ -22 +22 @@
 
 type
+
+  TIndexEntry = class
+  private
+    name: String;
+    topic: TTopic;
+    flags: uint8;
+  public
+    CONSTRUCTOR Create(aName: String; aTopic: TTopic; aFlags: uint8);
+    DESTRUCTOR Destroy; override;
+
+    PROPERTY getTopic: TTopic read topic;
+    FUNCTION getLabel: String;
+    FUNCTION isGlobal: boolean;
+    FUNCTION getLevel: integer;
+  end;
+
+
+  TIndex = class
+  private
+    entries: TStringList;
+    // labels: TStringList;
+  public
+    CONSTRUCTOR Create;
+    DESTRUCTOR Destroy; override;
+
+    FUNCTION Count: longint;
+    FUNCTION GetLabels: TStringList;
+    FUNCTION GetTopic(aPos: longint): TTopic;
+    PROCEDURE Add(anIndexEntry: TIndexEntry);
+  end;
+
+
   THelpFile = class
   protected
@@ -37 +69 @@
     _Dictionary: TList; // pointers to strings.
 
-    _Index: TStringList;
+    _Index: TIndex;
 
     _SearchTable: TSearchTable;
@@ -82 +114 @@
     function GetDictionaryWordPtr( Index: longint ): pstring;
 
-    function GetIndexEntryPtr( Index: longint ): pstring;
     function GetHighlightWords: UInt32ArrayPointer;
 
@@ -94 +125 @@
 
   public
-    constructor Create( const FileName: string );
+    constructor Create( const aFileName: string );
 
     destructor Destroy; override;
 
-    function GetIndex: TStringList;
+    function GetIndex: TIndex;
 
     property Title: string read _Title;
@@ -104 +135 @@
     property TopicList: TList read _Topics;
     property TopicCount: longint read GetTopicCount;
-    property Index: TStringList read GetIndex;
-    property IndexEntryPtr[ index: longint ]: pstring read GetIndexEntryPtr;
+    property Index: TIndex read GetIndex;
     property Filename: string read _FileName;
 
@@ -170 +200 @@
   FileErrorInUse: string;
   FileErrorInvalidHeader: string;
+
+
+  // -----------
+  // TIndexEntry
+  // -----------
+
+  CONSTRUCTOR TIndexEntry.Create(aName: String; aTopic: TTopic; aFlags: uint8);
+  begin
+    LogEvent(LogObjConstDest, 'TIndexEntry.Create');
+    name := aName;
+    topic := aTopic;
+    flags := aFlags;
+  end;
+
+
+  DESTRUCTOR TIndexEntry.Destroy;
+  begin
+    LogEvent(LogObjConstDest, 'TIndexEntry.Destroy');
+    topic := nil;
+    // inherited Destroy;
+  end;
+
+
+  FUNCTION TIndexEntry.getLabel: String;
+  begin
+    result := name;
+
+    // index level check (level 1 or 2)
+    if (getLevel) > 1 then
+    begin
+      result := '- ' + result;
+    end;
+
+    if isGlobal then
+    begin
+      result := result + ' (g)';
+    end;
+  end;
+
+
+  FUNCTION TIndexEntry.isGlobal: boolean;
+  begin
+    result := (flags and 64) > 0
+  end;
+
+
+  FUNCTION TIndexEntry.getLevel: integer;
+  begin
+    result := 1;
+
+    // index level check (level 1 or 2)
+    if (flags and 2 ) > 0 then
+    begin
+      result := 2;
+    end;
+  end;
+
+
+
+
+  // -----------
+  // TIndex
+  // -----------
+  CONSTRUCTOR TIndex.Create;
+  begin
+    inherited Create;
+
+    entries := TStringList.Create;
+    // labels := nil; // lazy
+  end;
+
+
+  DESTRUCTOR TIndex.Destroy;
+  var
+    i : longint;
+    tmpEntry : TIndexEntry;
+  begin
+    LogEvent(LogObjConstDest, 'TIndex.Destroy (size:' + IntToStr(entries.Count) + ')');
+
+    for i := 0 to entries.Count - 1 do
+    begin
+      tmpEntry := TIndexEntry(entries.Objects[i]);
+      if tmpEntry <> nil then
+      begin
+        tmpEntry.Destroy;
+        entries.Objects[i] := nil;
+      end;
+    end;
+    entries.Destroy;
+
+    inherited Destroy;
+  end;
+
+
+  FUNCTION TIndex.Count: longint;
+  begin
+    result := entries.Count;
+  end;
+
+
+  FUNCTION TIndex.GetLabels: TStringList;
+  begin
+    result := entries;
+  end;
+
+
+  FUNCTION TIndex.GetTopic(aPos: longint): TTopic;
+  begin
+    result := TTopic(entries.Objects[aPos]);
+  end;
+
+
+  PROCEDURE TIndex.add(anIndexEntry: TIndexEntry);
+  begin
+    // LogEvent(LogDebug, 'TIndex.add(' + aName + ', ' + anIndexEntry.ClassName);
+    entries.AddObject(anIndexEntry.getLabel, anIndexEntry);
+  end;
+
+
+
 
 Procedure OnLanguageEvent( Language: TLanguageFile;
@@ -221 +371 @@
 end;
 
-constructor THelpFile.Create( const FileName: string );
-begin
-  LogEvent(LogParse, 'Helpfile Load: ' + FileName);
-
-  _FileName := FileName;
+
+constructor THelpFile.Create(const aFileName: string);
+begin
+  LogEvent(LogObjConstDest, 'THelpFile.Create (file:' + aFileName + ')');
+  LogEvent(LogParse, 'Helpfile Load: ' + aFileName);
+
+  _FileName := aFileName;
 
   InitMembers;
@@ -248 +400 @@
 end;
 
+
 destructor THelpFile.Destroy;
 begin
+  LogEvent(LogObjConstDest, 'THelpFile.Destroy');
   DeallocateMemory( _pHeader );
   DeallocateMemory( _pExtendedHeader );
@@ -262 +416 @@
   DeallocateMemory( _pHighlightWords );
 
+  // index entries are pointing to topics
+  // so let us clean them first
+  if Assigned( _Index ) then
+  begin
+    _Index.Destroy;
+  end;
+
   if Assigned( _Topics ) then
+  begin
     DestroyListAndObjects( _Topics );
-
-  if Assigned( _Index ) then
-    _Index.Destroy;
+  end;
 
   _Dictionary.Free;
@@ -453 +613 @@
 end;
 
-function THelpFile.GetIndex: TStringList;
+
+function THelpFile.GetIndex: TIndex;
 begin
   if _Index = nil then
@@ -477 +638 @@
   pEnd: pointer;
   pIndexData: pointer;
+
+  tmpIndexEntry: TIndexEntry;
 begin
   LogEvent(LogParse, 'Read index');
 
-  _Index := TStringList.Create;
+  _Index := TIndex.Create;
 
   if _pHeader^.nindex = 0 then
@@ -504 +667 @@
 
     GetMemString( p, EntryText, IndexTitleLen );
-    if ( pEntryHeader^.flags and 2 ) > 0 then
-      EntryText := '- ' + EntryText;
+
     if pEntryHeader^.TOCIndex < _Topics.Count then
-      _Index.AddObject( EntryText, _Topics[ pEntryHeader^.TOCIndex ] )
+    begin
+      tmpIndexEntry := TIndexEntry.Create(EntryText, _Topics[pEntryHeader^.TOCIndex], pEntryHeader^.flags);
+      _Index.Add(tmpIndexEntry);
+    end
     else
 //      raise EHelpFileException.Create( 'Error reading help file index - out of range topic reference' );
@@ -666 +831 @@
 end;
 
+
+// TODO move to index class
 function THelpFile.FindTopicByIndexStartsWith( const SearchText: string ): TTopic;
 var
   i: longint;
-  tmpIndex: String;
+  tmpLabel: String;
 begin
   result := nil;
   GetIndex; // make sure it's read
+
   for i := 0 to _Index.Count - 1 do
   begin
-    tmpIndex := _Index.ValuePtrs[i]^;
-    if StrStartsWithIgnoringCase(tmpIndex, SearchText) then
+    tmpLabel := _Index.GetLabels.ValuePtrs[i]^;
+    if StrStartsWithIgnoringCase(tmpLabel, SearchText) then
     begin
       // found
-      result := TTopic( Index.Objects[ i ] );
+      result := Index.getTopic(i);
       exit;
     end;
@@ -685 +853 @@
 end;
 
-function THelpFile.FindTopicByIndexContains( const SearchText: string ): TTopic;
+
+function THelpFile.FindTopicByIndexContains(const SearchText: string): TTopic;
 var
   i: longint;
+  tmpLabel: String;
 begin
   result := nil;
   GetIndex; // make sure it's read
+
   for i := 0 to _Index.Count - 1 do
   begin
-    if CaseInsensitivePos( SearchText, _Index.ValuePtrs[ i ] ^ ) > 0 then
+    tmpLabel := _Index.GetLabels.ValuePtrs[i]^;
+    if CaseInsensitivePos(SearchText, tmpLabel) > 0 then
     begin
       // found
-      result := TTopic( Index.Objects[ i ] );
+      result := Index.getTopic(i);
       exit;
     end;
   end;
 end;
+
 
 function THelpFile.FindTopicByTitleStartsWith( const SearchText: string ): TTopic;
@@ -946 +1119 @@
 begin
   Result := pstring( _Dictionary[ Index ] );
-end;
-
-function THelpFile.GetIndexEntryPtr( Index: longint ): pstring;
-begin
-  if _Index = nil then
-    ReadIndex;
-  Result := _Index.ValuePtrs[ Index ];
 end;
 

trunk/NewView/MainForm.pas

@@ -383 +383 @@
     Procedure AddCurrentToMRUFiles;
 
-    Function LoadFiles( const FileNames: TStrings;
-                        HelpFiles: TList ): boolean;
+    Function LoadFiles(const aFileNames: TStrings; aHelpFiles: TList) : boolean;
     Procedure DisplayFiles( NewFiles: TList;
                             Var FirstContentsNode: TNode );
@@ -1612 +1611 @@
     end;
   end;
- 
+
   CreateMRUMenuItems;
 End;
@@ -1672 +1671 @@
   tmpFileNames := TStringList.Create;
 
-  StrExtractStringsIgnoreEmpty(tmpFileNames, TextList, [HELP_FILE_DELIMITER], #0);
+  ParseAndExpandFileNames(TextList, tmpFileNames);
   if tmpFileNames.Count > 0 then
   begin
-    result := OpenFiles(tmpFileNames, '', DisplayFirstTopic );
+    result := OpenFiles(tmpFileNames, '', DisplayFirstTopic);
   end
   else
@@ -2283 +2282 @@
     CmdLineParameters.writeDetailsTo(Lines);
     writeSettingsDetailsTo(Lines);
+    writeDebugSetupDetailsTo(Lines);
   end;
 
@@ -4065 +4065 @@
   if CmdLineParameters.getOwnerWindow <> NULLHANDLE then
   begin
-    LogEvent(LogStartup, 'Setting owner: '
-                  + IntToStr( CmdLineParameters.getOwnerWindow));
-    WinSetOwner( Frame.Handle,
-                 CmdLineParameters.getOwnerWindow );
-
+    LogEvent(LogStartup, 'Setting owner: ' + IntToStr( CmdLineParameters.getOwnerWindow));
+    WinSetOwner( Frame.Handle, CmdLineParameters.getOwnerWindow );
   end;
 
@@ -4085 +4082 @@
   CoolBar.SetMinConstButtonWidth;
 
-  LogEvent(LogStartup, 'Post WM_OPENED');
-
   ResetProgress;
 
@@ -4095 +4090 @@
   AddShortcut( kbCtrlCLeft, kbCtrlCLeft ); // back
 
+  LogEvent(LogStartup, 'Post WM_OPENED');
   PostMsg( Handle, WM_OPENED, 0, 0 );
 End;
@@ -4196 +4192 @@
   LogEvent(LogStartup, 'Finish paint');
   Update;
+  LogEvent(LogStartup, 'BringToFront');
+  MainForm.BringToFront;
 
   if not CmdLineParameters.getHelpManagerFlag then
@@ -4222 +4220 @@
     Filenames := TStringList.Create;
 
-    StrExtractStringsIgnoreEmpty(Filenames, tmpFileNames, [HELP_FILE_DELIMITER], #0);
-
+    ParseAndExpandFileNames(tmpFileNames, Filenames);
     LogEvent(LogStartup, 'Call OpenFiles');
 
@@ -5722 +5719 @@
   Tag:= MenuItem.Tag;
   MRUItem := Settings.MRUList[ Tag ];
+// RBRi woher kommt die liste?
   if OpenFiles( MRUItem.FileNames, '', true ) then
   begin
@@ -6228 +6226 @@
 procedure TMainForm.LoadIndex;
 var
-  HelpFile: THelpFile;
-  TextCompareResult: integer;
+  tmpHelpFile: THelpFile;
+  tmpTextCompareResult: integer;
 
   FileIndex: longint;
@@ -6235 +6233 @@
   Contents: TList;
   ContentsLists: TList; // of tlist
-  IndexLists: TList; // of tstringlist
+  tmpIndexLists: TList; // of tstringlist
   ContentsNextIndex: array[ 0..255 ] of longint;
   IndexNextIndex: array[ 0..255 ] of longint;
   Topic: TTopic;
 
-  ListIndex: longint;
-
   pListEntry: pstring;
   pLowestEntry: pstring;
   pLastEntry: pstring;
 
-  LowestEntryListIndex: longint;
-  LowestEntryListType: TListType;
-  LowestEntryTopic: TTopic;
-
-  Index: TStringList;
+  tmpLowestEntryListIndex: longint;
+  tmpLowestEntryListType: TListType;
+  tmpLowestEntryTopic: TTopic;
+
+  tmpIndex: TStringList;
 
   i : longint;
@@ -6264 +6260 @@
 
   ContentsLists := TList.Create;
-  IndexLists := TList.Create;
+  tmpIndexLists := TList.Create;
 
   // collect the contents and index lists from the files
   for FileIndex := 0 to CurrentOpenFiles.Count - 1 do
   begin
-    HelpFile := CurrentOpenFiles[ FileIndex ];
+    tmpHelpFile := CurrentOpenFiles[ FileIndex ];
     ProgressBar.Position := 70 + 10 * FileIndex div CurrentOpenFiles.Count;
 
@@ -6275 +6271 @@
     begin
       Contents := TList.Create;
-      Contents.Capacity := HelpFile.TopicCount;
+      Contents.Capacity := tmpHelpFile.TopicCount;
 
       // copy [contents] topic list
-      for i := 0 to HelpFile.TopicCount - 1 do
+      for i := 0 to tmpHelpFile.TopicCount - 1 do
       begin
-        Topic := HelpFile.Topics[ i ];
+        Topic := tmpHelpFile.Topics[ i ];
         if Topic.ShowInContents then
           Contents.Add( Topic );
@@ -6296 +6292 @@
     if Settings.IndexStyle in [ isFileOnly, isFull ] then
     begin
-      IndexLists.Add( HelpFile.Index );
-      IndexNextIndex[ IndexLists.Count - 1 ] := 0;
+      tmpIndexLists.Add(tmpHelpFile.Index.GetLabels);
+      IndexNextIndex[ tmpIndexLists.Count - 1 ] := 0;
     end;
   end;
@@ -6313 +6309 @@
   begin
     pLowestEntry := NullStr;
-    LowestEntryListIndex := -1;
+    tmpLowestEntryListIndex := -1;
 
     // Find alphabetically lowest (remaining) topic
 
     // first, look in contents lists
-    for ListIndex := 0 to ContentsLists.Count - 1 do
+    LogEvent(LogDebug, '  Merge contents' );
+    for i := 0 to ContentsLists.Count - 1 do
     begin
-      Contents := ContentsLists[ ListIndex ];
-      if ContentsNextIndex[ ListIndex ] < Contents.Count then
+      Contents := ContentsLists[i];
+      if ContentsNextIndex[i] < Contents.Count then
       begin
         // list is not yet finished, get next entry
-        Topic := Contents[ ContentsNextIndex[ ListIndex ] ];
+        Topic := Contents[ ContentsNextIndex[i] ];
         pListEntry := Topic.TitlePtr;
 
         if pLowestEntry^ <> '' then
-          TextCompareResult := CompareText( pListEntry^, pLowestEntry^ )
+          tmpTextCompareResult := CompareText( pListEntry^, pLowestEntry^ )
         else
-          TextCompareResult := -1;
-
-        if TextCompareResult < 0 then
+          tmpTextCompareResult := -1;
+
+        if tmpTextCompareResult < 0 then
         begin
           // this index entry comes before the lowest one so far
           pLowestEntry := pListEntry;
-          LowestEntryListIndex := ListIndex;
-          LowestEntryListType := ltContents;
-          LowestEntryTopic := Topic;
+          tmpLowestEntryListIndex := i;
+          tmpLowestEntryListType := ltContents;
+          tmpLowestEntryTopic := Topic;
         end;
       end;
@@ -6344 +6341 @@
 
     // look in indices
-    for ListIndex := 0 to IndexLists.Count - 1 do
+    LogEvent(LogDebug, '  Merge indices' );
+    for i := 0 to tmpIndexLists.Count - 1 do
     begin
-      Index := IndexLists[ ListIndex ];
-      if IndexNextIndex[ ListIndex ] < Index.Count then
+      LogEvent(LogDebug, '  Merge indices ' + IntToStr(i) );
+      tmpIndex := tmpIndexLists[i];
+      if IndexNextIndex[i] < tmpIndex.Count then
       begin
         // list is not yet finished, get next entry
-        pListEntry := Index.ValuePtrs[ IndexNextIndex[ ListIndex ] ];
+        pListEntry := tmpIndex.ValuePtrs[ IndexNextIndex[i] ];
 
         if pLowestEntry^ <> '' then
-          TextCompareResult := CompareText( pListEntry^, pLowestEntry^ )
+          tmpTextCompareResult := CompareText( pListEntry^, pLowestEntry^ )
         else
-          TextCompareResult := -1;
-
-        if TextCompareResult < 0 then
+          tmpTextCompareResult := -1;
+
+        if tmpTextCompareResult < 0 then
         begin
           // this index entry comes before the lowest one so far
           pLowestEntry := pListEntry;
-          LowestEntryListIndex := ListIndex;
-          LowestEntryListType := ltIndex;
-          LowestEntryTopic := TTopic( Index.Objects[ IndexNextIndex[ ListIndex ] ] );
+          tmpLowestEntryListIndex := i;
+          tmpLowestEntryListType := ltIndex;
+
+          LogEvent(LogDebug, '  Merge indices ' + tmpIndex.Objects[ IndexNextIndex[i] ].ClassName);
+          tmpLowestEntryTopic := TIndexEntry( tmpIndex.Objects[ IndexNextIndex[i] ] ).getTopic;
         end;
       end;
     end;
 
-    if LowestEntryListIndex = -1 then
+    if tmpLowestEntryListIndex = -1 then
       // we're out
       break;
@@ -6374 +6375 @@
     if ( pLowestEntry^ ) <> ( pLastEntry^ ) then
       // add, if different from last
-      DisplayedIndex.AddObject( pLowestEntry^,
-                                LowestEntryTopic );
+      DisplayedIndex.AddObject( pLowestEntry^, tmpLowestEntryTopic );
     pLastEntry := pLowestEntry;
 
-    if LowestEntryListType = ltContents then
+    if tmpLowestEntryListType = ltContents then
     begin
-      inc( ContentsNextIndex[ LowestEntryListIndex ] );
+      inc( ContentsNextIndex[ tmpLowestEntryListIndex ] );
     end
     else
@@ -6386 +6386 @@
       // found in one of indices.
       // Check for subsequent indented strings
-      Index := IndexLists[ LowestEntryListIndex ];
-
-      i := IndexNextIndex[ LowestEntryListIndex ] + 1;
-      while i < Index.Count do
+      tmpIndex := tmpIndexLists[ tmpLowestEntryListIndex ];
+
+      i := IndexNextIndex[ tmpLowestEntryListIndex ] + 1;
+      while i < tmpIndex.Count do
       begin
-        pListEntry := Index.ValuePtrs[ i ];
+        pListEntry := tmpIndex.ValuePtrs[ i ];
         if pListEntry^ = '' then
           break;
@@ -6400 +6400 @@
 
         // found one,
-        Topic := Index.Objects[ i ] as TTopic;
+        Topic := TIndexEntry(tmpIndex.Objects[ i ]).getTopic;
         DisplayedIndex.AddObject( pListEntry^,
                                   Topic );
         inc( i );
       end;
-      IndexNextIndex[ LowestEntryListIndex ] := i;
+      IndexNextIndex[ tmpLowestEntryListIndex ] := i;
     end;
   end;
@@ -6419 +6419 @@
   LogEvent(LogStartup, '  Tidy up' );
 
-  IndexLists.Destroy;
+  tmpIndexLists.Destroy;
 
   DestroyListAndObjects( ContentsLists );
@@ -6465 +6465 @@
                              const SelectFirstContentsNode: boolean ): boolean;
 var
-  FileNames: TStringList;
-begin
-  FileNames := TStringList.Create;
-  FileNames.Add( FileName );
-  Result := OpenFiles( FileNames,
+  tmpFileNames: TStringList;
+begin
+  tmpFileNames := TStringList.Create;
+  ParseAndExpandFileNames(FileName, tmpFileNames);
+  Result := OpenFiles( tmpFileNames,
                        WindowTitle,
                        DisplayFirstTopic );
-  FileNames.Destroy;
+  tmpFileNames.Destroy;
 end;
 
@@ -6478 +6478 @@
                                        const DisplayFirstTopic: boolean ): boolean;
 var
-  FileNames: TStringList;
-begin
-  FileNames := TStringList.Create;
-  FileNames.Add( FileName );
-  Result := OpenAdditionalFiles( FileNames,
-                                 DisplayFirstTopic );
-  FileNames.Destroy;
+  tmpFileNames: TStringList;
+begin
+  tmpFileNames := TStringList.Create;
+  ParseAndExpandFileNames(FileName, tmpFileNames);
+  Result := OpenAdditionalFiles(tmpFileNames, DisplayFirstTopic );
+  tmpFileNames.Destroy;
 end;
 
@@ -6528 +6527 @@
 
 // Load the specified set of help files
-Function TMainForm.LoadFiles( const FileNames: TStrings;
-                              HelpFiles: TList ): boolean;
+Function TMainForm.LoadFiles(const aFileNames: TStrings; aHelpFiles: TList) : boolean;
 var
   HelpFile: THelpFile;
-  FileIndex: longint;
+  FileIndex, i: longint;
   FileName: string;
   FullFilePath: string;
@@ -6544 +6542 @@
   LoadingFilenameList := TStringList.Create;
 
-  TranslateIPFEnvironmentVars( FileNames, LoadingFilenameList );
+// RBRi  TranslateIPFEnvironmentVars( FileNames, LoadingFilenameList );
+  for i := 0 to aFileNames.Count - 1 do
+  begin
+    LoadingFilenameList.Add(aFileNames[i]);
+  end;
 
   LogEvent(LogStartup, 'Finding files' );
@@ -6609 +6611 @@
          HelpFile.SetupFontSubstitutes( Settings.FixedFontSubstitutes );
 
-      HelpFiles.Add( HelpFile );
+      aHelpFiles.Add( HelpFile );
 
     except
@@ -6631 +6633 @@
         Result := false;
 
-        DestroyListObjects( HelpFiles );
+        DestroyListObjects( aHelpFiles );
 
         LoadingFilenameList.Destroy;
@@ -6650 +6652 @@
 Procedure TMainForm.AddCurrentToMRUFiles;
 var
-  Filenames: TStringList;
+  tmpFilenames: TStringList;
   i: longint;
-  HelpFile: THelpFile;
-begin
-  Filenames := TStringList.Create;
-
-  for i := 0 to CurrentOpenFiles.Count - 1 do
-  begin
-    HelpFile := CurrentOpenFiles[ i ];
-    Filenames.Add( HelpFile.Filename );
-  end;
-
-  // update most-recently-used file list
-  HelpFile := CurrentOpenFiles[ 0 ];
-  AddToMRUList( HelpFile.Title,
-                Filenames );
+  tmpHelpFile: THelpFile;
+begin
+  tmpFilenames := TStringList.Create;
+
+  if CurrentOpenFiles.Count > 0 then
+  begin
+    for i := 0 to CurrentOpenFiles.Count - 1 do
+    begin
+      tmpHelpFile := CurrentOpenFiles[ i ];
+      tmpFilenames.Add(tmpHelpFile.Filename);
+    end;
+
+    // update most-recently-used file list
+    tmpHelpFile := CurrentOpenFiles[ 0 ];
+    AddToMRUList(tmpHelpFile.Title, tmpFilenames);
+  end;
 
   // recreate menu
   CreateMRUMenuItems;
 
-  Filenames.Destroy;
+  tmpFilenames.Destroy;
 end;
 
@@ -6722 +6726 @@
                               const DisplayFirstTopic: boolean ): boolean;
 var
-  HelpFiles: TList;
+  tmpHelpFiles: TList;
   FirstContentsNode: TNode;
 begin
@@ -6732 +6736 @@
   SetWaitCursor;
 
-  HelpFiles := TList.Create;
-
-  if not LoadFiles(FileNames, HelpFiles ) then
+  tmpHelpFiles := TList.Create;
+
+// RBRi Translate
+  if not LoadFiles(FileNames, tmpHelpFiles) then
   begin
     ClearWaitCursor;
-    HelpFiles.Destroy;
+    tmpHelpFiles.Destroy;
     exit;
   end;
@@ -6751 +6756 @@
   CloseFile;
 
-  AssignList( HelpFiles, CurrentOpenFiles );
+  AssignList(tmpHelpFiles, CurrentOpenFiles );
 
   ProgressBar.Position := 50;
@@ -6770 +6775 @@
   ContentsOutline.Clear;
 
-  DisplayFiles( HelpFiles,
+  DisplayFiles( tmpHelpFiles,
                 FirstContentsNode );
 
@@ -6891 +6896 @@
       exit;
 
+    // no ParseAndExpandFileNames call required here
+    // this is the result of a file dialog
+    // no environment vars here
     if KeepCurrentFiles then
       OpenedOK := OpenAdditionalFiles( FileNames, true )

trunk/NewView/SearchUnit.pas

@@ -273 +273 @@
   for IndexIndex := 0 to HelpFile.Index.Count - 1 do
   begin
-    Topic := HelpFile.Index.Objects[ IndexIndex ] as TTopic;
-    pIndexEntry := HelpFile.IndexEntryPtr[ IndexIndex ];
+    Topic := HelpFile.Index.getTopic(IndexIndex);
+    pIndexEntry := HelpFile.Index.GetLabels.ValuePtrs[IndexIndex];
     IndexEntryWordIndex := 0;
 

trunk/NewView/StartupUnit.pas

@@ -19 +19 @@
 const
   OWN_HELP_MARKER = '[NVHELP]';
-  HELP_FILE_DELIMITER = '+';
 
 
@@ -26 +25 @@
 // Look for any items that are actually specifiying environment
 // variables, and expand them to the contents of the variables
-Procedure TranslateIPFEnvironmentVars(const Items: TStrings; ExpandedItems: TStrings );
 
 // Given a filename, which may or may not contain a path or extension,
@@ -51 +49 @@
   FileUtilsUnit;
 
-// Look for any items that are actually specifiying environment
-// variables, and expand them to the contents of the variables
-Procedure TranslateIPFEnvironmentVars(const Items: TStrings; ExpandedItems: TStrings );
-var
-  i : longint;
-  tmpItem: string;
-  tmpEnvironmentVarValue: string;
-begin
-  LogEvent(LogStartup, 'Translating environment vars' );
-  for i := 0 to Items.Count - 1 do
-  begin
-    tmpItem := Items[i];
-
-    tmpItem := StrTrimChars(tmpItem, [StrSingleQuote]); // remove single quotes
-    tmpItem := StrTrimChars(tmpItem, [StrDoubleQuote]); // remove double quotes
-
-    LogEvent(LogStartup, '  Checking for environment var: ' + tmpItem );
-    tmpEnvironmentVarValue := GetEnv( Uppercase( tmpItem ) );
-    if DosError = 0 then
-    begin
-      // environment var exists - use it's value
-      LogEvent(LogStartup, '    Environment var found; translated to: ' + tmpEnvironmentVarValue);
-      StrExtractStrings(ExpandedItems, tmpEnvironmentVarValue, [HELP_FILE_DELIMITER], #0);
-    end
-    else
-    begin
-      // not an environment var
-      ExpandedItems.Add(tmpItem);
-    end;
-  end;
-end;
 
 // Given a filename, which may or may not contain a path or extension,