diff --git a/src/mbase.scm b/src/mbase.scm index dceff16..a834820 100644 --- a/src/mbase.scm +++ b/src/mbase.scm @@ -50,7 +50,6 @@ mbase-update-by-id mbase-update - mbase-info mbase-stats mbase-add-unpaired diff --git a/src/members-print.scm b/src/members-print.scm index cb036e1..975fc1a 100644 --- a/src/members-print.scm +++ b/src/members-print.scm @@ -253,14 +253,16 @@ ;; Prints nicely aligned members base info (define (print-members-base-table mb) - (let* ((bi (mbase-info mb)) - (all-mrs (ldict-ref bi 'total)) - (invalid-mrs (ldict-ref bi 'invalid)) - (active-mrs (ldict-ref bi 'active)) - (suspended-mrs (ldict-ref bi 'suspended)) - (destroyed-mrs (ldict-ref bi 'destroyed)) - (student-mrs (ldict-ref bi 'students)) - (problem-mrs (ldict-ref bi 'problems)) + (let* ((total-count (length + (find-members-by-predicate mb brmember-usable?))) + (invalid-mrs (find-members-by-predicate + mb + (compose not is-4digit-prime? brmember-id))) + (active-mrs (find-members-by-predicate mb brmember-active?)) + (suspended-mrs (find-members-by-predicate mb brmember-suspended?)) + (destroyed-mrs (find-members-by-predicate mb brmember-destroyed?)) + (student-mrs (find-members-by-predicate mb brmember-student?)) + (problem-mrs (find-members-by-predicate mb brmember-has-problems?)) (debtor-mrs (sort (members-to-notify mb 3) brmemberstring