Fill-in remaining dokuwiki users into mbase.

This commit is contained in:
Dominik Pantůček 2023-06-27 19:03:09 +02:00
parent 5b03741eba
commit b4593ad377
2 changed files with 9 additions and 7 deletions

View file

@ -239,7 +239,7 @@
;; Load DokuWiki users ;; Load DokuWiki users
(define DW (dokuwiki-load-users)) (define DW (dokuwiki-load-users))
(define-values (MB dw-other) (mbase-merge-dokuwiki MB1 DW)) (define MB (mbase-merge-dokuwiki MB1 DW))
;; If a member is specified by either id or nick, get its record ;; If a member is specified by either id or nick, get its record
(define mr (define mr

View file

@ -315,16 +315,18 @@
;; 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) (if (null? dw)
(values (mbase-update mb (ldict-set
(lambda (mr) #t) (mbase-update mb
(lambda (mr) (lambda (mr) #t)
(brmember-set mr #:dokuwiki #t))) (lambda (mr)
dw) (brmember-set mr #:dokuwiki #t)))
'dokuwiki
'())
(let loop ((dw dw) (let loop ((dw dw)
(mb mb) (mb mb)
(rem '())) (rem '()))
(if (null? dw) (if (null? dw)
(values mb rem) (ldict-set mb 'dokuwiki rem)
(let* ((row (car dw)) (let* ((row (car dw))
(username (car row)) (username (car row))
(mr (find-member-by-nick mb username)) (mr (find-member-by-nick mb username))