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

 program OIDPLUS;
 (************************************************)
 (* OIDPLUS.PAS                                  *)
 (* Author:   Daniel Marschall                   *)
-(* Revision: 2022-02-19                         *)
+(* Revision: 2022-02-20                         *)
 (* 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-19';
+  VERSIONINFO            = 'Revision: 2022-02-20';
-  DEFAULT_STATUSBAR      = '(C)2020-2022 ViaThinkSoft. Licensed under the terms of the Apache 2.0 license.';
   TITLEBAR_LEFT_TEXT     = 'OIDplus';
   DISKIO_SOUND_DEBUGGING = false;
   DISKIO_SOUND_DELAY     = 500;
   ASNEDIT_LINES          = 10;
   DESCEDIT_LINES         = 10;
 begin
   DrawStatusBar('Press any key to continue');
   CursorOn;
   ReadKey;
   CursorOff;
-  DrawStatusBar(DEFAULT_STATUSBAR);
+  DrawStatusBar('');
 end;
 function _WriteOidFile(filename: string; oid: POid; ShowErrorMessage: boolean): boolean;
 var
   res: boolean;
     Sound(70);
     Delay(DISKIO_SOUND_DELAY - 10);
     NoSound;
     Delay(10);
   end;
-  DrawStatusBar(DEFAULT_STATUSBAR);
+  DrawStatusBar('');
   _WriteOidFile := res;
   if ShowErrorMessage and not res then
   begin
     Sound(50);
     Delay(DISKIO_SOUND_DELAY - 10);
     NoSound;
     Delay(10);
   end;
-  DrawStatusBar(DEFAULT_STATUSBAR);
+  DrawStatusBar('');
   _ReadOidFile := res;
   if ShowErrorMessage and not res then
   begin
     end;
     menuIdNew  := ListAppend(asnList, '<NEW>');
     menuIdSave := ListAppend(asnList, '<SAVE>');
     menuIdExit := ListAppend(asnList, '<CANCEL>');
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('');
     x := SINGLE_LINE_BOX_PADDING;
     y := ScreenHeight div 2 - ASNEDIT_LINES div 2;
     w := ScreenWidth - (SINGLE_LINE_BOX_PADDING-1)*2;
     h := ASNEDIT_LINES;
     res := DrawSelectionList(x, y, w, h,
     end;
     menuIdNew  := ListAppend(iriList, '<NEW>');
     menuIdSave := ListAppend(iriList, '<SAVE>');
     menuIdExit := ListAppend(iriList, '<CANCEL>');
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('');
     x := SINGLE_LINE_BOX_PADDING;
     y := ScreenHeight div 2 - ASNEDIT_LINES div 2;
     w := ScreenWidth - (SINGLE_LINE_BOX_PADDING-1)*2;
     h := ASNEDIT_LINES;
     res := DrawSelectionList(x, y, w, h,
   end;
   NextPossibleFileId := sId;
   FreeList(list);
 end;
-function NumIdAlreadyExisting(parentOID: POID; sInput: string): boolean;
+function NumIdAlreadyExisting(parentOID: POID; arcval: string): boolean;
 var
   searchDotNotation: string;
   sTmp: string;
   i: integer;
 begin
   if parentOID^.DotNotation = '' then
-    searchDotNotation := sInput
+    searchDotNotation := arcval
   else
-    searchDotNotation := parentOID^.DotNotation + '.' + sInput;
+    searchDotNotation := parentOID^.DotNotation + '.' + arcval;
   for i := 0 to ListCount(parentOID^.SubIds)-1 do
   begin
     sTmp := ListGetElement(parentOID^.SubIds, i);
     if DotNotationPart(sTmp) = searchDotNotation then
     begin
 end;
 function NumIdEditor(oid: POID; parentOID: POID): boolean;
 var
   sInput: string;
+  title: string;
+  base36mode: boolean;
+  arcval: string;
 begin
   NumIdEditor := false;
   sInput := '';
+  base36mode := false;
   CursorOn;
   repeat
+    if base36mode then
+    begin
+      DrawStatusBar('Press ESC to cancel');
+      title := 'ENTER BASE36 ID'
+    end
+    else
+    begin
+      DrawStatusBar('Enter "WEID" to enter a Base36 instead of Base10; press ESC to cancel');
+      title := 'ENTER NUMERIC ID';
+    end;
     if QueryVal(sInput,
                 SINGLE_LINE_BOX_PADDING_INNER,
                 ScreenHeight div 2,
                 ScreenWidth - (SINGLE_LINE_BOX_PADDING_INNER-1)*2,
 ,
-                'ENTER NUMERIC ID',
+                title,
 ) then
     begin
       if sInput = '' then continue;
+      if not base36mode and (sInput = 'WEID') then
+      begin
+        sInput := '';
+        base36mode := true;
+      end
-      if not IsPositiveIntegerOrZero(sInput) then
+      else if not base36mode and not IsPositiveIntegerOrZero(sInput) then
       begin
         ShowMessage('Invalid numeric ID (must be a positive integer)', 'ERROR', true);
         _Pause;
       end
-      else if (parentOID^.DotNotation='') and (StrToInt(sInput) > 2) then
+      else if base36mode and not IsBase36String(sInput) then
+      begin
+        ShowMessage('Invalid base36 ID (must be 0..9, A..Z)', 'ERROR', true);
+        _Pause;
+      end
+      else
+      begin
+        if base36mode then
+          arcval := base_convert_bigint(sInput, 36, 10)
+        else
+          arcval := sInput;
+        arcval := StripLeadingZeros(arcval);
+        if (parentOID^.DotNotation='') and (arcval <> '0') and (arcval <> '1') and (arcval <> '2') then
-      begin
+        begin
-        ShowMessage('Invalid numeric ID (root arc can only be 0, 1, or 2)', 'ERROR', true);
+          ShowMessage('Invalid numeric ID (root arc can only be 0, 1, or 2)', 'ERROR', true);
-        _Pause;
+          _Pause;
-      end
+        end
-      else if ((parentOID^.DotNotation='0') or (parentOID^.DotNotation='1')) and (StrToInt(sInput) > 39) then
+        else if ((parentOID^.DotNotation='0') or (parentOID^.DotNotation='1')) and
+                ((Length(arcval)>2) or (StrToInt(arcval) > 39)) then
-      begin
+        begin
-        ShowMessage('Invalid numeric ID (root 0 and 1 must have sub-arc of 0..39)', 'ERROR', true);
+          ShowMessage('Invalid numeric ID (root 0 and 1 must have sub-arc of 0..39)', 'ERROR', true);
-        _Pause;
+          _Pause;
-      end
+        end
-      else if NumIdAlreadyExisting(parentOID, sInput) then
+        else if NumIdAlreadyExisting(parentOID, arcval) then
-      begin
+        begin
-        ShowMessage('This numeric ID is already used in this arc', 'ERROR', true);
+          ShowMessage('This numeric ID is already used in this arc', 'ERROR', true);
-        _Pause;
+          _Pause;
-      end
+        end
-      else
+        else
-      begin
+        begin
-        if parentOID^.DotNotation = '' then
+          if parentOID^.DotNotation = '' then
-          oid^.DotNotation := sInput
+            oid^.DotNotation := arcval
-        else
+          else
-          oid^.DotNotation := parentOID^.DotNotation + '.' + sInput;
+            oid^.DotNotation := parentOID^.DotNotation + '.' + arcval;
-        NumIdEditor := true; (* request caller to save <oid> *)
+          NumIdEditor := true; (* request caller to save <oid> *)
-        Break;
+          Break;
-      end;
+        end;
+      end;
     end
     else
     begin
+      (* User pressed ESC *)
       Break;
     end;
   until false;
   CursorOff;
 end;
     (* Print OID information *)
     ClrScr;
     _DrawOidTitleBar(filename, oid);
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('');
     GotoXY(1,2);
-    (*if oid^.DotNotation <> '' then*)
-    begin
-      Write('Dot notation:   ');
+    Write('Dot notation:   ');
-      WriteLnKeepX(DotNotation(oid));
+    WriteLnKeepX(DotNotation(oid));
-      Write('IRI notation:   ');
-      WriteLnKeepX(IriNotation(oid));
-      Write('ASN.1 notation: ');
+    Write('ASN.1 notation: ');
-      WriteLnKeepX(AsnNotation(oid));
+    WriteLnKeepX(AsnNotation(oid));
+    Write('OID-IRI:        ');
+    WriteLnKeepX(IriNotation(oid));
-      Write('WEID notation:  ');
+    Write('WEID notation:  ');
-      WriteLnKeepX(WeidNotation(oid));
+    WriteLnKeepX(WeidNotation(oid));
-      WriteLn('');
+    WriteLn('');
-    end;
     if Trim(oid^.Description) <> '' then
     begin
       (* WriteLn('Description:'); *)
       WriteLn(oid^.Description);
     end
     else menuIdAsnEdit := -99;
     if oid^.DotNotation <> '' then
     begin
-      menuIdIriEdit := ListAppend(subsel, 'View/Edit Unicode Labels');
+      menuIdIriEdit := ListAppend(subsel, 'View/Edit Unicode Labels (OID-IRI)');
       ListAppend(subfiles, '');
     end
     else menuIdIriEdit := -99;
     menuIdDescEdit := ListAppend(subsel, 'Edit description');
   ListLoadFromFile(list, TREEVIEW_FILENAME);
   DrawSelectionList(2, 3, ScreenWidth-2, ScreenHeight-4,
                     list, true, 'PREVIEW OF '+TREEVIEW_FILENAME, 2);
   (* TODO: Jump to selected OID *)
-  DrawStatusBar(DEFAULT_STATUSBAR);
+  DrawStatusBar('');
   FreeList(list);
 end;
 procedure OP_TreeView;
   (* This will try creating a new root file if it does not exist *)
   rootfile := _GetRootFile(true);
   if rootfile = '' then
   begin
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('');
     Exit;
   end;
   Assign(F, TREEVIEW_FILENAME);
   {$I-}
   if IoResult <> 0 then
   begin
     (* Can happen if disk is read-only (Runtime Error 150) *)
     ShowMessage('Cannot open '+TREEVIEW_FILENAME+' for writing.', 'ERROR', true);
     _Pause;
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('');
     Exit;
   end;
   res := false;
   CreateOidDef(rootoid);
   end;
   FreeOidDef(rootoid);
   Close(F);
-  DrawStatusBar(DEFAULT_STATUSBAR);
+  DrawStatusBar('');
   if res then
   begin
     ShowMessage('TreeView successfully exported as '+TREEVIEW_FILENAME, 'TREEVIEW EXPORT', true);
     _Pause;
   end;
 begin
   repeat
     ClrScr;
     DrawTitleBar('Welcome to OIDplus for DOS', '', '');
-    DrawStatusBar(DEFAULT_STATUSBAR);
+    DrawStatusBar('(C)2020-2022 ViaThinkSoft. Licensed under the terms of the Apache 2.0 license.');
     GoToXY(ScreenWidth-Length(VERSIONINFO), ScreenHeight-1);
     Write(VERSIONINFO);
     CreateList(menu);

Subversion Repositories oidplus

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