@@ -4259,46 +4259,49 @@
 
 ;;======================================================================
 ;; cached writes stuff
 ;;======================================================================
 
-(define (dbfile:add-cached-write dbstruct proc run-id params)
+(define (db:add-cached-write dbstruct proc run-id params)
+  (debug:print 0 *default-log-port* "Adding cached write for run-id "run-id" params " params)
   (mutex-lock! *cached-writes-mutex*)
   (let* ((hkey                (cons dbstruct run-id))
 	 (cached-writes-queue (hash-table-ref/default *cached-writes-queues* hkey '())))
     (hash-table-set! *cached-writes-queues* hkey (cons (list proc params) cached-writes-queue)))
   (if (not *cached-writes-flag*)
       (begin
 	(set! *cached-writes-flag* #t)
 	(thread-start! (make-thread
 			(lambda ()
+			  (debug:print 0 *default-log-port* "process cached writes thread started.")
 			  (thread-sleep! 1)
-			  (dbfile:process-cached-writes-queue))))))
+			  (db:process-cached-writes-queue))))))
   (mutex-unlock! *cached-writes-mutex*))
 
 (define (db:process-cached-writes-queue)
   (mutex-lock! *cached-writes-mutex*)
   (hash-table-for-each
    *cached-writes-queues*
    (lambda (hkey writes-list)
      (let* ((dbstruct (car hkey))
 	    (run-id   (cdr hkey)))
+       (debug:print 0 *default-log-port* "Processing "(length writes-list)" cached writes for run "run-id)
        (db:with-db
 	dbstruct
 	run-id
 	#t 
-	(lambda (db)
+	(lambda (dbdat db)
 	  (sqlite3:with-transaction
 	   db
 	   (lambda ()
 	     (for-each
 	      (lambda (queued-write)
 		(match queued-write
-		       ((proc params)(apply proc params))
+		       ((proc params)(apply proc dbstruct params))
 		       (else (assert #f "BAD queued-write"))))
 	      writes-list))))))))
-  (set! *cached-writes* #f)
+  (set! *cached-writes-flag* #f)
   (mutex-unlock! *cached-writes-mutex*))
 
 ;; (db:extract-ods-file db "outputfile.ods" '(("sysname" "%")("fsname" "%")("datapath" "%")) "%")
 
 ;;======================================================================