diff --git a/src/brmember.scm b/src/brmember.scm index 307a93f..ec3f5b4 100644 --- a/src/brmember.scm +++ b/src/brmember.scm @@ -54,6 +54,7 @@ brmember-usable? brmember-in-dokuwiki? brmember-has-problems? + brmember-file-has-problems? brmember-destroyed? brmember-suspended? @@ -284,7 +285,7 @@ (equal? email memail)) #f)))) - ;; True if member record is OK + ;; True if member record is not OK (define (brmember-has-problems? mr) (or (member-has-errors? mr) (not (null? (brmember-missing-keys mr))) @@ -296,6 +297,14 @@ (not (brmember-dokuwiki-email-ok? mr))) )) + ;; True if member record is not OK + (define (brmember-file-has-problems? mr) + (or (member-has-errors? mr) + (not (null? (brmember-missing-keys mr))) + (not (brmember-usable? mr)) + (not (is-4digit-prime? (brmember-id mr))) + )) + ;; Returns true if the member record represents non-existing ;; member. The *current-month* is a global parameter from period ;; module. diff --git a/src/members-print.scm b/src/members-print.scm index bee75f3..5e49d5a 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -366,7 +366,7 @@ ... ((#:right light) ... none)) #:ansi-reset? #t))) - (let ((pmrs (find-members-by-predicate mb brmember-has-problems?))) + (let ((pmrs (find-members-by-predicate mb brmember-file-has-problems?))) (when (not (null? pmrs)) (newline) (print "Member files with errors (" (length pmrs) "): " @@ -375,7 +375,7 @@ ", ")))) (let ((pmrs (find-members-by-predicate mb (lambda (mr) (and (brmember-has-highlights? mr) - (not (brmember-has-problems? mr))))))) + (not (brmember-file-has-problems? mr))))))) (when (not (null? pmrs)) (newline) (print "Member files with issues: "