From 4de89a6e94653fd112bfcb63e8f247411ec1888b Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Thu, 7 May 2026 12:33:11 -0700 Subject: [PATCH] Fix library>DATABASEFNS DUMPDB to use get the FILEDATES correctly (#2593) DUMPDB fixed to use ROOTFILENAME vs. NAMEFIELD (U-CASE vs. actual) to retrieve and dump the source file's FILEDATES, so the .DATABASE can be loaded. --- library/DATABASEFNS | 25 ++++++++++++++----------- library/DATABASEFNS.LCOM | Bin 7757 -> 7777 bytes 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index e25c5366..5b24e24d 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,16 +1,17 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "20-Feb-2024 23:45:56" {DSK}e>Interlisp>medley>library>DATABASEFNS.;4 18445 +(FILECREATED " 2-May-2026 17:38:46" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;4 18684 :EDIT-BY "mth" :CHANGES-TO (FNS DUMPDB) - :PREVIOUS-DATE "19-Feb-2024 16:29:44" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) + :PREVIOUS-DATE "29-Apr-2026 17:43:56" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;2 +) (* ; " -Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. +Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation. ") (PRETTYCOMPRINT DATABASEFNSCOMS) @@ -164,7 +165,9 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 20-Feb-2024 23:45 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 2-May-2026 17:32 by mth") + (* ; "Edited 29-Apr-2026 17:42 by mth") + (* ; "Edited 20-Feb-2024 23:45 by mth") (* ; "Edited 7-Feb-2024 18:26 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") @@ -180,7 +183,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (LET ((SAVEDCOPYRIGHTFLG COPYRIGHTFLG) (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) (CL:UNWIND-PROTECT - (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (NAMEFIELD FILE)) + (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (ROOTFILENAME FILE)) (FNS (FILEFNSLST FILE))) (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) (SETQ DBROOTFN (ROOTFILENAME DBFN)) @@ -230,7 +233,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (PRETTYDEF NIL DBFN `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) (ERROR!))) - (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] + (E [PRINT (CAR (GETPROP ',FL 'FILEDATES] (DUMPDATABASE ',FNS] [COND (PROPFLG (PRINT (FULLNAME DBFILE) @@ -375,9 +378,9 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (RESETSAVE DWIMIFYCOMPFLG T) ) -(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) +(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024 2026)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1768 6793 (DBFILE 1778 . 3423) (DBFILE1 3425 . 4935) (DBFILE2 4937 . 6159) (LOAD 6161 - . 6391) (LOADFROM 6393 . 6581) (MAKEFILE 6583 . 6791)) (6849 17838 (DUMPDB 6859 . 11873) (LOADDB -11875 . 16750) (MAKEDB 16752 . 17836))))) + (FILEMAP (NIL (1783 6808 (DBFILE 1793 . 3438) (DBFILE1 3440 . 4950) (DBFILE2 4952 . 6174) (LOAD 6176 + . 6406) (LOADFROM 6408 . 6596) (MAKEFILE 6598 . 6806)) (6864 18072 (DUMPDB 6874 . 12107) (LOADDB +12109 . 16984) (MAKEDB 16986 . 18070))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index aa806c4cebcde11dab16bba5c1a9ae89e5cae494..1d2842245a1aca64c63ea47ef0fe07b46d8e1db3 100644 GIT binary patch delta 344 zcmX?W^U%g#!^PFj)6Z4c&C|zK*VE6wIO?aZcgs_5FFscq$HN4reLZ!w=%F$(&W+rIn^2Ho)A|T1tlz& zn<*(&y99gJ+910?o7c?3M1jl7)x|SJ*C}#xJEMUbvc*7$n;2V}0`+oXYF1}7+RVr_ pPk_;5^8%qPMxG#l{}7NX{2YB%?c1pu1NSepO< delta 321 zcmaE8bJoUQ!^PFj)6Z4c&C|zK*VE6wIO?aZcgs_o;u3Ku7u91O}iGq=_m5Hg9>BKB4*4(@jyVQxj+9HNV2zdiTD+3cN z1M`VzG~N($93!QQnt zP@6Rb6bvm)OiUH5TwOdvbe$r(CigQMC>dHJoMUKaWn^h(VxpwLg`!oR(Qq>_(>wvj hu+3|PvKTr29DRYo