WebSVN – oidplus – Diff – /trunk_dos/OIDPLUS.PAS

 program OIDPLUS;
 (************************************************)
 (* OIDPLUS.PAS                                  *)
 (* Author:   Daniel Marschall                   *)
-(* Revision: 2022-02-20                         *)
+(* Revision: 2022-02-27                         *)
 (* License:  Apache 2.0                         *)
 (* This file contains:                          *)
 (* - "OIDplus for DOS" program                  *)
 (************************************************)
 uses
   Dos, Crt, Drivers, StrList, VtsFuncs, VtsCui, OidFile, OidUtils,
   Weid;
 const
-  VERSIONINFO            = 'Revision: 2022-02-20';
+  VERSIONINFO            = 'Revision: 2022-02-27';
   TITLEBAR_LEFT_TEXT     = 'OIDplus';
   DISKIO_SOUND_DEBUGGING = false;
   DISKIO_SOUND_DELAY     = 500;
   ASNEDIT_LINES          = 10;
   DESCEDIT_LINES         = 10;
   sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
   _GetTreeViewLine := sTmp;
 end;
-procedure _RecTreeExport(oid: POID; var F: Text; indent: integer);
+procedure _RecTreeExport(oid: POID; visList, targetList: PStringList; indent: integer);
 var
   i: integer;
   sTmp: string;
   suboid: POID;
   childFilename: string;
 begin
   sTmp := _GetTreeViewLine(oid, indent);
   sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-  WriteLn(F, sTmp);
+  ListAppend(visList, sTmp);
+  ListAppend(targetList, oid^.FileID);
   (* Recursively call children *)
   for i := 0 to ListCount(oid^.SubIds)-1 do
   begin
     sTmp := ListGetElement(oid^.SubIds, i);
     childFilename := FileIdPart(sTmp) + OID_EXTENSION;
     if not FileExists(childFilename) then
     begin
       sTmp := 'ERROR: MISSING ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-      WriteLn(F, sTmp);
+      ListAppend(visList, sTmp);
+      ListAppend(targetList, 'ERROR');
     end
     else if not _ReadOidFile(childFilename, suboid, false) then
     begin
       sTmp := 'ERROR: READ ERROR AT ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-      WriteLn(F, sTmp);
+      ListAppend(visList, sTmp);
+      ListAppend(targetList, 'ERROR');
     end
     else if (suboid^.ParentFileId <> oid^.FileId) or
             (suboid^.ParentDotNotation <> oid^.DotNotation) then
     begin
       (* This can happen if a file is missing, and then another OID gets this filename since the number seems to be free *)
       sTmp := 'ERROR: BAD BACKREF AT ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-      WriteLn(F, sTmp);
+      ListAppend(visList, sTmp);
+      ListAppend(targetList, 'ERROR');
     end
     else
     begin
-      _RecTreeExport(suboid, F, indent+1);
+      _RecTreeExport(suboid, visList, targetList, indent+1);
       FreeOidDef(suboid);
     end
   end;
 end;
-procedure TreeViewPreview;
+procedure TreeViewPreview(visList, targetList: PStringList);
 var
+  res: integer;
-  list: PStringList;
+  sTmp: string;
 begin
   ClrScr;
   DrawTitleBar('TreeView Export', TITLEBAR_LEFT_TEXT, TREEVIEW_FILENAME);
-  DrawStatusBar('Press ESC to return to the main menu');
+  DrawStatusBar('Press ESC to return to the main menu. Enter to jump to OID.');
-  CreateList(list);
+  while true do
+  begin
-  ListLoadFromFile(list, TREEVIEW_FILENAME);
-  DrawSelectionList(2, 3, ScreenWidth-2, ScreenHeight-4,
+    res := DrawSelectionList(2, 3, ScreenWidth-2, ScreenHeight-4,
-                    list, true, 'PREVIEW OF '+TREEVIEW_FILENAME, 2);
+                             visList, true, 'PREVIEW OF '+TREEVIEW_FILENAME, 2);
+    if res > -1 then
+    begin
-  (* TODO: Jump to selected OID *)
+      (* Jump to selected OID or show error *)
+      sTmp := ListGetElement(targetList, res);
+      if sTmp = 'ERROR' then
+      begin
+        ShowMessage(ListGetElement(visList, res), 'ERROR', true);
+        _Pause;
+      end
+      else
+      begin
+        DisplayOidFile(sTmp + '.OID');
+      end;
+    end
+    else
+    begin
+      break;
+    end;
+  end;
   DrawStatusBar('');
-  FreeList(list);
 end;
 procedure OP_TreeView;
 var
   F: Text;
   rootoid: POID;
   rootfile: string;
   res: boolean;
+  visList, targetList: PStringList;
 begin
   ClrScr;
   DrawTitleBar('TreeView Export', TITLEBAR_LEFT_TEXT, '');
   DrawStatusBar('Exporting data... please wait...');
   begin
     DrawStatusBar('');
     Exit;
   end;
+  CreateList(visList);
+  CreateList(targetList);
+  (* First check if the disk is read-only *)
   Assign(F, TREEVIEW_FILENAME);
   {$I-}
   Rewrite(F);
   {$I+}
   if IoResult <> 0 then
     ShowMessage('Cannot open '+TREEVIEW_FILENAME+' for writing.', 'ERROR', true);
     _Pause;
     DrawStatusBar('');
     Exit;
   end;
+  Close(F);
+  (* Now do the export *)
   res := false;
   CreateOidDef(rootoid);
   if _ReadOidFile(rootfile, rootoid, true) then
   begin
-    _RecTreeExport(rootoid, F, 0);
+    _RecTreeExport(rootoid, visList, targetList, 0);
     res := true;
   end;
   FreeOidDef(rootoid);
+  (* Save the list (visual part only) *)
-  Close(F);
+  ListSaveToFile(visList, TREEVIEW_FILENAME);
   DrawStatusBar('');
   if res then
   begin
     ShowMessage('TreeView successfully exported as '+TREEVIEW_FILENAME, 'TREEVIEW EXPORT', true);
     _Pause;
   end;
+  TreeViewPreview(visList, targetList);
-  TreeViewPreview;
+  FreeList(visList);
+  FreeList(targetList);
 end;
 procedure OP_MainMenu;
 var
   menu: PStringList;

Subversion Repositories oidplus

oidplus/trunk_dos/OIDPLUS.PAS – Rev 749 → 758