From 7a895930e1691be610463cfb5d6b54cd6ac50958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 29 Mar 2023 18:43:24 +0200 Subject: [PATCH] Deal with destroyed using period handling. --- member-record.scm | 10 ++++------ members-base.scm | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/member-record.scm b/member-record.scm index aced5fc..f824e15 100644 --- a/member-record.scm +++ b/member-record.scm @@ -226,13 +226,11 @@ (or (member-has-errors? mr) (not (is-4digit-prime? (member-id mr))))) - ;; Returns true if the member record represents destroyed member. The - ;; *current-month* is a global parameter from period module. + ;; Returns true if the member record represents non-existing + ;; member. The *current-month* is a global parameter from period + ;; module. (define (member-destroyed? mr) - (let ((destroyed (member-record-info mr 'destroyed #f))) - (and destroyed - (monthmonth destroyed) - (*current-month*))))) + (not (member-existing? mr))) ;; Generic period-based predicate (define ((member-period-predicate? key) mr) diff --git a/members-base.scm b/members-base.scm index 94a4a19..62c545a 100644 --- a/members-base.scm +++ b/members-base.scm @@ -376,7 +376,7 @@ (let ((pmrs (filter-members-by-predicate mb member-has-problems?))) (when (not (null? pmrs)) (newline) - (print "Member files with errors: " + (print "Member files with errors (" (length pmrs) "): " (string-intersperse (map member-file-path pmrs) ", "))))