diff --git a/src/brmember-format.scm b/src/brmember-format.scm index b7cec00..c7b4021 100644 --- a/src/brmember-format.scm +++ b/src/brmember-format.scm @@ -48,9 +48,9 @@ (if (eq? ch #\~) (loop (cddr fmtl) (cons (case (cadr fmtl) - ((#\N) (member-nick mr)) - ((#\I) (number->string (member-id mr))) - ((#\S) (number->string (member-suspended-months mr))) + ((#\N) (brmember-nick mr)) + ((#\I) (number->string (brmember-id mr))) + ((#\S) (number->string (brmember-suspended-months mr))) ((#\E) (let ((n (length (ldict-ref mr 'highlights '())))) (if (eq? n 0) diff --git a/src/brmember.scm b/src/brmember.scm index ea794d3..f57c697 100644 --- a/src/brmember.scm +++ b/src/brmember.scm @@ -57,9 +57,9 @@ brmember-existing? brmember-flags - member-nick - member-id - member-suspended-months + brmember-nick + brmember-id + brmember-suspended-months memberstring aliases) ", ")) (when (brmember-suspended? mr) - (print " Suspended for " (member-suspended-months mr) " months.")) + (print " Suspended for " (brmember-suspended-months mr) " months.")) (newline) (let loop ((sinfo sinfo)) (when (not (null? sinfo)) @@ -89,7 +89,7 @@ ;; Returns nicely formatted table (define (member-info->table mr) (let* ((aliases (ldict-ref mr 'symlinks)) - (mid (member-id mr)) + (mid (brmember-id mr)) (head (list (if (is-4digit-prime? mid) (list "ID:" mid) (list (ansi-string #:red #:bold "ID:") @@ -98,7 +98,7 @@ (string-intersperse (map symbol->string aliases) ", ")) (if (brmember-suspended? mr) (list "Suspended for:" - (let ((msm (member-suspended-months mr))) + (let ((msm (brmember-suspended-months mr))) (sprintf "~A month~A" msm (if (> msm 1) "s" "")))) #f))) @@ -228,7 +228,7 @@ (member-records->string (sort student-mrs member= (member-suspended-months mr) 24)) + (>= (brmember-suspended-months mr) 24)) suspended-mrs))) (when (not (null? suspended2)) (print (ansi #:magenta) " Suspended for at least 24 months (" @@ -272,7 +272,7 @@ (members-table-row a:warning "Destroyed:" destroyed-mrs "~N~E") (let ((suspended2 (filter (lambda (mr) - (>= (member-suspended-months mr) + (>= (brmember-suspended-months mr) (*member-suspend-max-months*))) suspended-mrs))) (if (null? suspended2) @@ -350,7 +350,7 @@ (credit (ldict-ref balance 'credit)) (payment (ldict-ref balance 'payment)) (total (- (+ credit payment) fees))) - (list (member-nick mr) + (list (brmember-nick mr) (if (brmember-suspended? mr) 'suspended (if (brmember-student? mr) diff --git a/src/web-static.scm b/src/web-static.scm index b8fd6b1..340f078 100644 --- a/src/web-static.scm +++ b/src/web-static.scm @@ -50,8 +50,8 @@ ;; Generate all the files in specified (default current) directory. (define (gen-web-static-member mr . dirs) - (let ((nick (member-nick mr)) - (id (member-id mr)) + (let ((nick (brmember-nick mr)) + (id (brmember-id mr)) (dir (if (null? dirs) (current-directory) (car dirs))))