From b4593ad37709658e9f9a2aa33063f21ab83f13b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Tue, 27 Jun 2023 19:03:09 +0200 Subject: [PATCH] Fill-in remaining dokuwiki users into mbase. --- src/hackerbase.scm | 2 +- src/mbase.scm | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/hackerbase.scm b/src/hackerbase.scm index d8b6614..e24369c 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -239,7 +239,7 @@ ;; Load DokuWiki 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 (define mr diff --git a/src/mbase.scm b/src/mbase.scm index a0aad69..3731dc5 100644 --- a/src/mbase.scm +++ b/src/mbase.scm @@ -315,16 +315,18 @@ ;; and list of remaining users. (define (mbase-merge-dokuwiki mb dw) (if (null? dw) - (values (mbase-update mb - (lambda (mr) #t) - (lambda (mr) - (brmember-set mr #:dokuwiki #t))) - dw) + (ldict-set + (mbase-update mb + (lambda (mr) #t) + (lambda (mr) + (brmember-set mr #:dokuwiki #t))) + 'dokuwiki + '()) (let loop ((dw dw) (mb mb) (rem '())) (if (null? dw) - (values mb rem) + (ldict-set mb 'dokuwiki rem) (let* ((row (car dw)) (username (car row)) (mr (find-member-by-nick mb username))