Show destroyed only when requested in fees.

src/bbstool.scm

@@ -69,6 +69,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 (define -normal-month- (make-parameter #t))
 (define -jendasap-checked- (make-parameter "checked.ntlm"))
 (define -ml-all- (make-parameter #f))
+(define -show-destroyed- (make-parameter #f))
 
 ;; Arguments parsing
 (command-line
@@ -98,6 +99,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	   (-jendasap-checked- file))
  (-ml-all () "Load all mailman lists"
 	  (-ml-all- #t))
+ (-destroyed () "Show destroyed members in -fees"
+	     (-show-destroyed- #t))
  ""
  "Query options:"
  (-mi (id) "Specify member by id" (-member-id- (string->number id)))
@@ -262,7 +265,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
        (print "No problems found."))))
   ((fees)
    (newline)
-   (print-members-fees-table MB))
+   (print-members-fees-table MB (-show-destroyed-)))
   ((repl)
    (repl))
   ((genweb)

src/members-print.scm

@@ -337,9 +337,11 @@
 	      ")"))))
 
  ;; Prints summary table of all fees and credits for all members
- (define (print-members-fees-table MB)
-   (let ((balances (map member-balance (members-base-members MB)))
-	 (members ;; Pass 1
+ (define (print-members-fees-table MB . ds)
+   (let ((destroyed? (if (null? ds)
+			 #f
+			 (car ds))))
+     (let* ((members ;; Pass 1
 	     (map
 	      (lambda (mr)
 		(let* ((balance (member-balance mr))
@@ -359,8 +361,18 @@
 			credit
 			payment
 			total
+			balance
 			)))
-	   (sort (members-base-members MB) member<?))))
+	      (sort
+	       (if destroyed?
+		   (members-base-members MB)
+		   (filter (lambda (mr)
+			     (not (member-destroyed? mr)))
+			   (members-base-members MB)))
+	       member<?)))
+	    (balances (map (lambda (m)
+			     (list-ref m 6))
+			   members)))
        (print
 	(table->string
 	 (cons
@@ -433,7 +445,7 @@
 		   (* (lookup-member-fee 'student) students))
 		" (" full " full members + " students " students)"))
        )
-   )
+     ))
 
  ;; Prints all transactions which the members base considers unpaired.
  (define (print-unpaired-table mb)