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

   MAINMENU_ALLOW_ESC     = false;
   TREEVIEW_INDENT        = 0;
   TREEVIEW_INCLUDE_DESC  = true;
   TREEVIEW_WIDTH         = 80;
-procedure _WriteOidFile(filename: string; oid: POid);
+procedure _Pause;
+var
+  bakX, bakY: integer;
 begin
+  bakX := WhereX;
+  bakY := WhereY;
-  DrawStatusBar('Write file ' + filename + '...');
+  DrawStatusBar('Press any key to continue');
-  WriteOidFile(filename, oid);
+  GoToXY(bakX, bakY);
+  ReadKey;
+  DrawStatusBar(DEFAULT_STATUSBAR);
+end;
+function _WriteOidFile(filename: string; oid: POid; ShowErrorMessage: boolean): boolean;
+var
+  res: boolean;
+begin
+  DrawStatusBar('Write file ' + filename + '...');
+  res := WriteOidFile(filename, oid);
   if DISKIO_SOUND_DEBUGGING then
   begin
     Sound(70);
     Delay(DISKIO_SOUND_DELAY - 10);
     NoSound;
     Delay(10);
   end;
   DrawStatusBar(DEFAULT_STATUSBAR);
+  _WriteOidFile := res;
+  if ShowErrorMessage and not res then
+  begin
+    ShowMessage('Cannot write to file ' + filename, 'ERROR', true);
+    _Pause;
+  end;
 end;
-procedure _ReadOidFile(filename: string; oid: POid);
+function _ReadOidFile(filename: string; oid: POid; ShowErrorMessage: boolean): boolean;
+var
+  res: boolean;
 begin
   DrawStatusBar('Read file ' + filename + '...');
-  ReadOidFile(filename, oid);
+  res := ReadOidFile(filename, oid);
   if DISKIO_SOUND_DEBUGGING then
   begin
     Sound(50);
     Delay(DISKIO_SOUND_DELAY - 10);
     NoSound;
     Delay(10);
   end;
   DrawStatusBar(DEFAULT_STATUSBAR);
-end;
-procedure _Pause;
+  _ReadOidFile := res;
-var
-  bakX, bakY: integer;
+  if ShowErrorMessage and not res then
-begin
+  begin
-  bakX := WhereX;
-  bakY := WhereY;
-  DrawStatusBar('Press any key to continue');
+    ShowMessage('Cannot read file ' + filename, 'ERROR', true);
-  GoToXY(bakX, bakY);
+    _Pause;
-  ReadKey;
+  end;
-  DrawStatusBar(DEFAULT_STATUSBAR);
 end;
 function _ShowASNIds(childOID: POID): string;
 var
   j, jmax: integer;
   if NumIdEditor(newOID, oid) and
      AsnEditor(newOID) and
      DescEditor(newOID) then
   begin
     newfilename := newOID^.FileId + '.OID';
-    _WriteOidFile(newfilename, newOID);
+    if _WriteOidFile(newfilename, newOID, true) then
+    begin
-    (* Add link to original file and enable the saving of it *)
+      (* Add link to original file and enable the saving of it *)
-    ListAppend(oid^.SubIds, newOID^.FileId + newOID^.DotNotation);
+      ListAppend(oid^.SubIds, newOID^.FileId + newOID^.DotNotation);
-    NewOidEditor := true; (* request caller to save <oid> *)
+      NewOidEditor := true; (* request caller to save <oid> *)
-  end;
+    end;
+  end;
   FreeOidDef(newOID);
 end;
 procedure DeleteChildrenRecursive(oid: POID);
 var
   begin
     filenameChild := FileIdPart(ListGetElement(oid^.SubIds, i)) + '.OID';
     if FileExists(filenameChild) then
     begin
       CreateOidDef(childOID);
-      _ReadOidFile(filenameChild, childOID);
+      if _ReadOidFile(filenameChild, childOID, false) then
+      begin
-      DeleteChildrenRecursive(childOID);
+        DeleteChildrenRecursive(childOID);
+      end;
       FreeOidDef(childOID);
       DeleteFile(filenameChild);
     end;
   end;
   ListClear(oid^.SubIds);
 begin
   (* Remove all children and their files recursively *)
   DeleteChildrenRecursive(selfOID);
   (* Remove forward reference in parent OID *)
+  (* (this is the most important part)      *)
   filenameParent := FileIdPart(selfOID^.Parent) + '.OID';
   if FileExists(filenameParent) then
   begin
     CreateOidDef(parentOID);
-    _ReadOidFile(filenameParent, parentOID);
+    if _ReadOidFile(filenameParent, parentOID, true) then
+    begin
-    if ListDeleteElementByValue(parentOID^.SubIds, selfOID^.FileId + selfOID^.DotNotation) then
+      if ListDeleteElementByValue(parentOID^.SubIds, selfOID^.FileId + selfOID^.DotNotation) then
-    begin
+      begin
-      _WriteOidFile(filenameParent, parentOID);
+        _WriteOidFile(filenameParent, parentOID, true);
+      end;
     end;
     FreeOidDef(parentOID);
   end;
   (* Delete own file *)
   exitRequest: boolean;
   menuIdExit, menuIdAsnEdit, menuIdDescEdit, menuIdAdd, menuIdDelete: integer;
 begin
   exitRequest := false;
   repeat
+    CreateOidDef(oid);
-    if not FileExists(filename) then
+    if not _ReadOidFile(filename, oid, true) then
     begin
-      ShowMessage('File ' + filename + ' not found', 'ERROR', true);
-      _Pause;
+      FreeOidDef(oid);
       exit;
     end;
-    CreateOidDef(oid);
-    _ReadOidFile(filename, oid);
     (* Print OID information *)
     ClrScr;
     _DrawOidTitleBar(filename, oid);
     DrawStatusBar(DEFAULT_STATUSBAR);
       sTmp := oid^.Parent;
       subfile := FileIdPart(sTmp) + '.OID';
       if FileExists(subfile) then
       begin
         CreateOidDef(tmpOID);
-        _ReadOidFile(subfile, tmpOID);
+        if _ReadOidFile(subfile, tmpOID, true) then
-        ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID));
+          ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID))
+        else
+          ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + ' (READ ERROR)');
         FreeOidDef(tmpOID);
       end
       else
       begin
         ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + ' (FILE NOT FOUND)');
       sTmp := ListGetElement(oid^.SubIds, i);
       subfile := FileIdPart(sTmp) + '.OID';
       if FileExists(subfile) then
       begin
         CreateOidDef(tmpOID);
-        _ReadOidFile(subfile, tmpOID);
+        if _ReadOidFile(subfile, tmpOID, true) then
-        ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID));
+          ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID))
+        else
+          ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + ' (READ ERROR)');
         FreeOidDef(tmpOID);
       end
       else
       begin
         ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + ' (FILE NOT FOUND)');
       exitRequest := true;
     end
     else if subselres = menuIdAsnEdit then
     begin
       if AsnEditor(oid) then
-        _WriteOidFile(filename, oid);
+        _WriteOidFile(filename, oid, true);
     end
     else if subselres = menuIdDescEdit then
     begin
       if DescEditor(oid) then
-        _WriteOidFile(filename, oid);
+        _WriteOidFile(filename, oid, true);
     end
     else if subselres = menuIdAdd then
     begin
       if NewOidEditor(oid) then
-        _WriteOidFile(filename, oid);
+        _WriteOidFile(filename, oid, true);
     end
     else if subselres = menuIdDelete then
     begin
       if _DeleteConfirmation then
       begin
         begin
           filename := sTmp;
         end
         else
         begin
-          ShowMessage('Parent file ' + filename + ' not found', 'ERROR', true);
+          ShowMessage('Parent file ' + sTmp + ' not found', 'ERROR', true);
           _Pause;
           exitRequest := true;
         end;
       end;
     end
       begin
         filename := sTmp;
       end
       else
       begin
-        ShowMessage('File ' + filename + ' not found', 'ERROR', true);
+        ShowMessage('File ' + sTmp + ' not found', 'ERROR', true);
         _Pause;
       end;
     end;
     FreeList(subsel);
     FreeList(subfiles);
     FreeOidDef(oid);
   until exitRequest;
 end;
-procedure CreateRootOIDFile(filename: string);
+function CreateRootOIDFile(filename: string; ShowErrorMessage: boolean): boolean;
 var
   oid: POID;
 begin
   CreateOidDef(oid);
   oid^.Description := 'This is the root of the OID tree.' +#13#10 +
                       '- 1 (iso)' + #13#10 +
                       '- 2 (joint-iso-itu-t)';
   oid^.FileId      := ZeroPad(0, 8);
   oid^.DotNotation := '';
   oid^.Parent      := ZeroPad(0, 8);
-  _WriteOidFile(filename, oid);
+  CreateRootOIDFile := _WriteOidFile(filename, oid, ShowErrorMessage);
   FreeOidDef(oid);
 end;
 function _GetRootFile(ShowErrorMessage: boolean): string;
 var
   rootFile: string;
 begin
   rootFile := ZeroPad(0, 8) + '.OID';
+  _GetRootFile := rootFile;
   if not FileExists(rootFile) then
   begin
-    {$I-}
-    CreateRootOIDFile(rootFile);
+    if not CreateRootOIDFile(rootFile, ShowErrorMessage) then
-    {$I+}
-  end;
-  if not FileExists(rootFile) then
-  begin
+    begin
-    _GetRootFile := '';
+      _GetRootFile := '';
-    if ShowErrorMessage then
-    begin
-      ShowMessage('Cannot create ' + rootfile + '! Is disk read-only?', 'ERROR', true);
-      _Pause;
     end;
-  end
-  else
-  begin
-    _GetRootFile := rootFile;
   end;
 end;
 procedure OP_ManageOIDs;
 var
 end;
 procedure OP_ReturnToMSDOS;
 begin
   ClrScr;
+  TextBackground(Black);
+  TextColor(LightGray);
   WriteLn('Thank you for using OIDplus for DOS.');
-  WRiteLn('');
+  WriteLn('');
 end;
 function _GetTreeViewLine(oid: POID; indent: integer): string;
 var
   i: integer;
   for i := 0 to ListCount(oid^.SubIds)-1 do
   begin
     sTmp := ListGetElement(oid^.SubIds, i);
     CreateOidDef(suboid);
     childFilename := FileIdPart(sTmp) + '.OID';
-    if FileExists(childFilename) then
+    if not FileExists(childFilename) then
     begin
-      _ReadOidFile(childFilename, suboid);
+      sTmp := 'ERROR: ' + childFilename + ' FILE MISSING (CONTAINS ' + DotNotationPart(sTmp) + ')!';
-      _RecTreeExport(suboid, F, indent+1);
+      sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-      FreeOidDef(suboid);
+      WriteLn(F, sTmp);
     end
-    else
+    else if not _ReadOidFile(childFilename, suboid, false) then
     begin
-      sTmp := 'ERROR: FILE ' + childFilename + ' CONTAINING CHILD OID ' + DotNotationPart(sTmp) + ' WAS NOT FOUND!';
+      sTmp := 'ERROR: ' + childFilename + ' READ ERROR (CONTAINS ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
       WriteLn(F, sTmp);
-    end;
+    end
+    else
+    begin
+      _RecTreeExport(suboid, F, indent+1);
+      FreeOidDef(suboid);
+    end
   end;
 end;
 procedure OP_TreeView;
 var
   F: Text;
   rootoid: POID;
   rootfile: string;
+  res: boolean;
 begin
   ClrScr;
   DrawTitleBar('TreeView Export', TITLEBAR_LEFT_TEXT, '');
   DrawStatusBar('Exporting data... please wait...');
   (* This will try creating a new root file if it does not exist *)
-  rootfile := _GetRootFile(true);;
+  rootfile := _GetRootFile(true);
-  if rootfile = '' then Exit;
+  if rootfile = '' then
+  begin
+    DrawStatusBar(DEFAULT_STATUSBAR);
+    Exit;
+  end;
   Assign(F, 'OIDTREE.TXT');
+  {$I-}
   Rewrite(F);
+  {$I+}
+  if IoResult <> 0 then
+  begin
+    (* Can happen if disk is read-only (Runtime Error 150) *)
+    ShowMessage('Cannot open OIDTREE.TXT for writing.', 'ERROR', true);
+    _Pause;
+    DrawStatusBar(DEFAULT_STATUSBAR);
+    Exit;
+  end;
+  res := false;
   CreateOidDef(rootoid);
-  _ReadOidFile(rootfile, rootoid);
+  if _ReadOidFile(rootfile, rootoid, true) then
+  begin
-  _RecTreeExport(rootoid, F, 0);
+    _RecTreeExport(rootoid, F, 0);
+    res := true;
+  end;
   FreeOidDef(rootoid);
+  Close(F);
   DrawStatusBar(DEFAULT_STATUSBAR);
+  if res then
+  begin
-  ShowMessage('TreeView successfully exported as OIDTREE.TXT', 'TREEVIEW EXPORT', true);
+    ShowMessage('TreeView successfully exported as OIDTREE.TXT', 'TREEVIEW EXPORT', true);
-  _Pause;
+    _Pause;
-  Close(F);
+  end;
 end;
 procedure OP_MainMenu;
 var
   menu: PStringList;

Subversion Repositories oidplus

oidplus/trunk_dos/OIDPLUS.PAS – Rev 742 → 743