From 3ef6c0b6286d13503d697deb77e949dc76860d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Tue, 11 Apr 2023 22:11:11 +0200
Subject: [PATCH] Rename source and info.

---
 src/brmember-format.scm |  2 +-
 src/brmember.scm        | 20 ++++++++++----------
 src/member-fees.scm     |  4 ++--
 src/members-base.scm    |  4 ++--
 src/members-print.scm   |  2 +-
 src/reminders.scm       |  2 +-
 src/web-static.scm      |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/brmember-format.scm b/src/brmember-format.scm
index 614622a..b7cec00 100644
--- a/src/brmember-format.scm
+++ b/src/brmember-format.scm
@@ -48,7 +48,7 @@
 	   (if (eq? ch #\~)
 	       (loop (cddr fmtl)
 		     (cons (case (cadr fmtl)
-			     ((#\N) (member-record-info mr 'nick))
+			     ((#\N) (member-nick mr))
 			     ((#\I) (number->string (member-id mr)))
 			     ((#\S) (number->string (member-suspended-months mr)))
 			     ((#\E)
diff --git a/src/brmember.scm b/src/brmember.scm
index 998ace3..2a94d46 100644
--- a/src/brmember.scm
+++ b/src/brmember.scm
@@ -43,8 +43,8 @@
   brmember-sub-has-key?
   brmember-sub-ensure
 
-  member-source
-  member-record-info
+  brmember-source
+  brmember-info
   member-missing-keys
   member-has-highlights?
   member-record-usable?
@@ -203,11 +203,11 @@
 			 (ldict-set sd key val))))))))
 
  ;; Returns source lines
- (define (member-source mr)
+ (define (brmember-source mr)
    (ldict-ref mr 'source '()))
 
  ;; Returns member info key value
- (define (member-record-info mr key . defaults)
+ (define (brmember-info mr key . defaults)
    (let ((info (ldict-ref mr 'info)))
      (if (null? defaults)
 	 (ldict-ref info key)
@@ -252,7 +252,7 @@
  ;; module.
  (define (member-destroyed? mr)
    (and (not (member-existing? mr))
-	(let ((member (member-record-info mr 'member)))
+	(let ((member (brmember-info mr 'member)))
 	  (if (null? member)
 	      #f
 	      (month>=? (*current-month*)
@@ -260,7 +260,7 @@
 
  ;; Generic period-based predicate
  (define ((member-period-predicate? key) mr)
-   (let ((periods (member-record-info mr key #f)))
+   (let ((periods (brmember-info mr key #f)))
      (and periods
 	  (month-in-periods? periods))))
 
@@ -284,13 +284,13 @@
 
  ;; Returns true if the member is active (not suspended or destroyed).
  (define (member-active? mr)
-   (and (month-in-periods? (member-record-info mr 'member))
+   (and (month-in-periods? (brmember-info mr 'member))
 	(not (member-suspended? mr))))
 
  ;; Returns true if the member is currently a member
  (define (member-existing? mr)
    (month-in-periods?
-    (member-record-info mr 'member)))
+    (brmember-info mr 'member)))
 
  ;; Returns a list of flags of given member record.
  (define (member-flags mr)
@@ -303,7 +303,7 @@
 
  ;; Nickname as string
  (define (member-nick mr)
-   (member-record-info mr 'nick))
+   (brmember-info mr 'nick))
 
  ;; Returns member id
  (define (member-id mr)
@@ -313,7 +313,7 @@
  ;; suspended.
  (define (member-suspended-months mr)
    (if (member-suspended? mr)
-       (let ((period (periods-match (member-record-info mr 'suspend))))
+       (let ((period (periods-match (brmember-info mr 'suspend))))
 	 (if period
 	     (month-diff (car period) (*current-month*))
 	     0))
diff --git a/src/member-fees.scm b/src/member-fees.scm
index 9ee07c8..d8a94b6 100644
--- a/src/member-fees.scm
+++ b/src/member-fees.scm
@@ -76,7 +76,7 @@
    (let ((last-month (if (null? args)
 			 (*current-month*)
 			 (car args)))
-	 (first-month (period-since (car (member-record-info mr 'member)))))
+	 (first-month (period-since (car (brmember-info mr 'member)))))
      (let loop ((cm first-month)
 		(cal '()))
        (if (month>? cm last-month)
@@ -165,7 +165,7 @@
 
  ;; Total credit manually recorded in member record
  (define (member-credit-total mr)
-   (let* ((credit (member-record-info mr 'credit '()))
+   (let* ((credit (brmember-info mr 'credit '()))
 	  (amounts (map car credit)))
      (foldl + 0 amounts)))
 
diff --git a/src/members-base.scm b/src/members-base.scm
index c70c07f..74bd0e1 100644
--- a/src/members-base.scm
+++ b/src/members-base.scm
@@ -239,7 +239,7 @@
      string?
      (map
       (lambda (mr)
-	(member-record-info mr 'mail))
+	(brmember-info mr 'mail))
       (filter member-active?
 	      (members-base-members mb))))
     string-ci<?))
@@ -251,7 +251,7 @@
      (foldl (lambda (mb email)
 	      (members-base-update mb
 				   (lambda (mr)
-				     (equal? (member-record-info mr 'mail #f)
+				     (equal? (brmember-info mr 'mail #f)
 					     email))
 				   (lambda (mr)
 				     (member-add-mailman mr listname))))
diff --git a/src/members-print.scm b/src/members-print.scm
index d4641d5..10d248e 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -167,7 +167,7 @@
 
  ;; Nicely prints the member source with any errors recorded.
  (define (print-member-source mr)
-   (let* ((lines (member-source mr))
+   (let* ((lines (brmember-source mr))
 	  (file-name (ldict-ref mr 'file-name))
 	  (hls (ldict-ref mr 'highlights '())))
      (print file-name ":")
diff --git a/src/reminders.scm b/src/reminders.scm
index 7d707f6..4a0995a 100644
--- a/src/reminders.scm
+++ b/src/reminders.scm
@@ -73,7 +73,7 @@
  ;; Creates reminder email dictionary
  (define (make-reminder-email mr)
    (make-ldict
-    `((to . ,(member-record-info mr 'mail))
+    `((to . ,(brmember-info mr 'mail))
       (subject . "Připomínka členských příspěvků / Membership fees reminder")
       (body . ,(reminder-email-body mr)))))
 
diff --git a/src/web-static.scm b/src/web-static.scm
index bc0ff69..b8fd6b1 100644
--- a/src/web-static.scm
+++ b/src/web-static.scm
@@ -63,7 +63,7 @@
 	 (print (member-total-balance mr))))
      (with-output-to-file (make-pathname dir (sprintf "~A.misc" nick))
        (lambda ()
-	 (let loop ((lines (member-source mr)))
+	 (let loop ((lines (brmember-source mr)))
 	   (when (not (null? lines))
 	     (print (car lines))
 	     (loop (cdr lines))))))