Skip dokuwiki checks if no dokuwiki is loaded.

This commit is contained in:
Dominik Pantůček 2023-06-26 21:48:16 +02:00
parent c4f81dacbe
commit 697dcd24db
2 changed files with 39 additions and 31 deletions

View file

@ -314,6 +314,12 @@
;; Adds dokuwiki information to all users found, returns new mbase ;; Adds dokuwiki information to all users found, returns new mbase
;; and list of remaining users. ;; and list of remaining users.
(define (mbase-merge-dokuwiki mb dw) (define (mbase-merge-dokuwiki mb dw)
(if (null? dw)
(values (mbase-update mb
(lambda (mr) #t)
(lambda (mr)
(brmember-set mr #:dokuwiki #t)))
dw)
(let loop ((dw dw) (let loop ((dw dw)
(mb mb) (mb mb)
(rem '())) (rem '()))
@ -339,7 +345,7 @@
rem)) rem))
(loop (cdr dw) (loop (cdr dw)
mb mb
(cons row rem))))))) (cons row rem))))))))
;; Simple syntax wrapper ;; Simple syntax wrapper
(define-syntax with-mbase-progress% (define-syntax with-mbase-progress%

View file

@ -136,11 +136,13 @@
(mailman (list (list "Mailing Lists" (mailman (list (list "Mailing Lists"
(string-intersperse (brmember-mailman mr) "\n")))) (string-intersperse (brmember-mailman mr) "\n"))))
(dokuwiki (if (ldict-contains? mr 'dokuwiki) (dokuwiki (if (ldict-contains? mr 'dokuwiki)
(if (eq? (ldict-ref mr 'dokuwiki) #t)
(list #f)
(list (list "DokuWiki" (list (list "DokuWiki"
(format "Groups: ~A\nEmail: ~A" (format "Groups: ~A\nEmail: ~A"
(brmember-sub-ref mr 'dokuwiki 'groups) (brmember-sub-ref mr 'dokuwiki 'groups)
(brmember-sub-ref mr 'dokuwiki 'email) (brmember-sub-ref mr 'dokuwiki 'email)
))) ))))
(list (list (ansi-string #:red "DokuWiki") (list (list (ansi-string #:red "DokuWiki")
(ansi-string #:red "---"))))) (ansi-string #:red "---")))))
(result (filter identity (append head body mailman dokuwiki)))) (result (filter identity (append head body mailman dokuwiki))))