Load and call merge on DW.

src/dokuwiki.scm

@@ -61,7 +61,7 @@
 		      (email (cadddr row))
 		      (groupstr (list-ref row 4))
 		      (groups (string-split groupstr ",")))
-		 (print "u=" username " n=" name " e=" email " g=" groups)
+		 ;;(print "u=" username " n=" name " e=" email " g=" groups)
 		 (loop (cdr lines)
 		       (cons (list username name email groups)
 			     users))))))))

src/hackerbase.scm

@@ -47,7 +47,8 @@
 	util-dict-list
 	util-stdout
 	table
-	export-web-static)
+	export-web-static
+	dokuwiki)
 
 ;; Command-line options and configurable parameters
 (define -needs-bank- (make-parameter #f))
@@ -237,7 +238,8 @@
       (values #f #f)))
 
 ;; Load DokuWiki users
-(define MB MB1)
+(define DW (dokuwiki-load-users))
+(define-values (MB dw-other) (mbase-merge-dokuwiki MB1 DW))
 
 ;; If a member is specified by either id or nick, get its record
 (define mr

src/mbase.scm

@@ -58,6 +58,7 @@
   mbase-active-emails
 
   mbase-merge-mailman
+  mbase-merge-dokuwiki
 
   do-with-mbase-progress%
   with-mbase-progress%
@@ -310,6 +311,11 @@
 		    (add1 i))))
 	(progress%-advance 1)))))
 
+ ;; Adds dokuwiki information to all users found, returns new mbase
+ ;; and list of remaining users.
+ (define (mbase-merge-dokuwiki mb dw)
+   (values mb dw))
+
  ;; Simple syntax wrapper
  (define-syntax with-mbase-progress%
    (syntax-rules ()