From 4dec18527e16523484761aed3efa9e7523a6aa37 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Wed, 7 Feb 2024 18:47:37 -0800 Subject: [PATCH] Made this "smarter": If COPYRIGHTFLG is NEVER or DEFAULTDATABASECOPYRIGHTOWNER is NIL or the .DATABASE file already has a COPYRIGHT property Then No need to do anything special (it already shouldn't ask) Else If DEFAULTDATABASECOPYRIGHTOWNER is NONE or NEVER Then Set the COPYRIGHT to NONE (I.e., never mention it again.) is SAME Then Same as the source file. If it doesn't have one, then just normal handling is DEFAULT Then Use the general default for copyright: DEFAULTCOPYRIGHTOWNER Otherwise: Enable the general copyright defaulting. Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys. --- library/DATABASEFNS | 46 ++++++++++++++++++++++++++------------- library/DATABASEFNS.LCOM | Bin 7350 -> 7420 bytes 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index 7b5afabc..c6ed0691 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,6 +1,6 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 6-Feb-2024 21:23:34" {DSK}e>Interlisp>medley>library>DATABASEFNS.;6 16912 +(FILECREATED " 7-Feb-2024 18:26:12" {DSK}e>Interlisp>medley>library>DATABASEFNS.;13 17643 :EDIT-BY "mth" @@ -165,7 +165,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 6-Feb-2024 21:23 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 7-Feb-2024 18:26 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") @@ -177,18 +177,35 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) (CL:WHEN (AND FILE (OR (LITATOM FILE) (STRINGP FILE))) - (PROG (DBFILE DBFN DBCPR (FL (NAMEFIELD FILE)) + (PROG (DBFILE DBFN FLCPR (FL (NAMEFIELD FILE)) (FNS (FILEFNSLST FILE)) (COPYRIGHTFLG COPYRIGHTFLG) (DEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) - [COND - ([NULL (SETQ DBCPR (GETPROP DBFN 'COPYRIGHT] - (COND - [(MEMQ DEFAULTDATABASECOPYRIGHTOWNER '(NONE NEVER)) - (/PUT DBFN 'COPYRIGHT (LIST 'NONE] - (DEFAULTDATABASECOPYRIGHTOWNER (SETQ COPYRIGHTFLG 'DEFAULT) - (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER] + (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) + (NULL DEFAULTDATABASECOPYRIGHTOWNER) + (GETPROP DBFN 'COPYRIGHT)) + (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER + ((NONE NEVER) + (* ;; "Set the COPYRIGHT to NONE (I.e., never mention it again.)") + + (/PUT DBFN 'COPYRIGHT (LIST 'NONE))) + (SAME + (* ;; + "Same as the source file. If it doesn't have one, then just normal handling") + + (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) + (/PUT DBFN 'COPYRIGHT (LIST (CAR FLCPR))))) + (DEFAULT + (* ;; "Use the general default for copyright") + + (SETQ COPYRIGHTFLG 'DEFAULT)) + (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) + + (* ;; + "Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys") + + (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) (COND (FNS) ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) @@ -206,8 +223,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] (CL:WHEN MSFILETABLE [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) - [SETQ DBFILE (PRETTYDEF NIL (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL - 'BODY FILE) + [SETQ DBFILE (PRETTYDEF NIL DBFN `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) (ERROR!))) (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] @@ -354,7 +370,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. ) (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1802 6827 (DBFILE 1812 . 3457) (DBFILE1 3459 . 4969) (DBFILE2 4971 . 6193) (LOAD 6195 - . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16311 (DUMPDB 6893 . 10346) (LOADDB -10348 . 15223) (MAKEDB 15225 . 16309))))) + (FILEMAP (NIL (1803 6828 (DBFILE 1813 . 3458) (DBFILE1 3460 . 4970) (DBFILE2 4972 . 6194) (LOAD 6196 + . 6426) (LOADFROM 6428 . 6616) (MAKEFILE 6618 . 6826)) (6884 17042 (DUMPDB 6894 . 11077) (LOADDB +11079 . 15954) (MAKEDB 15956 . 17040))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 47f391307a2410a85f597bb1718b1e5bacb87299..0663e6e410134d61a03ba17abe004b1e9b8c891c 100644 GIT binary patch delta 1058 zcmZuwOKTHR6z;T8u|l<}^;zT)H!adS_c3?o7KBckn>Hnx#FG%;7!Xr%1`|svoA(zowazPT^Q2}5*JdwmLJllg zDV1w(es#^y6;@FpA**tBrQj#}Qq@uJJZQgh*WVv#zv^|i-2HgCe0&7I&toqR zw4bpYpVd><)D#~Nwo|jsTkDTPqi*MUb+Y}e9)XEa)7hy`#<2ULcel?T79)e`*t&2c zwEL9lv+2XN!SmbgE3vJk^$pKQZ1-(+-FzKgW8bQi!PlwA>Gs;4(A%gM1rKu`c^BkU zpcR9csYcV#DO@dAeBhSR6HEeSH}9ZI7?7(J3XWY=zzuR&o3diGX;f^ zz^d}gZmA566Y!Pi#|)JsVW_1e^xDLv4%h-AAoPmQmDfb5L(vNry$%_47&AVM=|4Q-Q3Xtw;Mp50 zn+eC1=_JxpNs>~4a{UM(68$y@fhi$FfrzyFlMWF)g}+k3nFi|Nk#naAUQ0k{|h-~a#s delta 1005 zcmZuwOK;Oa5N=Y4AP8tf6QQC?qliO;6q=mL&fGb)MI0&tCoV`x{UwMWz=5%oI*x=7>zVmx_M7>3_pkm%Kis+{%8l)(Wm=&e zC|RX!mGPrjG9`{q_VfS2ig2_~=LHa<6AG)c-tx<}UiS1L_2_0=Kybdel!peWux2|w zx7A$t8|@|rwBXxZVOWCH&&=#hy4wGEochu4v+AEu->X+=@cTUb?l^TavPbLYjm^3F zyO&>t=w#W6%TShReQ1E;k6O3A00@VdHrSG`515^m`rRR?kN+w99t03ee z9S}X-zhx01nz*o3Er!(!thmyQb|eZ(>_~_hb&i~-G&ewFL1v*gPnV=VtqQ-qQg~FQQ0^{mfD#j^bIaQ!$*L%Q-4#Tc= zy_RjElW2fdbdX!Vv?7S=1j06u4?Crr0;U)GW2sbi+E?^xAL*y^*=SC+ z4pRv%FOS5H2Q8KG{-^;f$P&>h6k+Gd9_$X_`P