Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1338,15 +1338,15 @@
     (db:delay-if-busy dbdat)
     (for-each
      (lambda (toptest)
        (let ((test-name (list-ref toptest 3)))
 ;;	     (run-id    (list-ref toptest 5)))
-	 (db:top-test-set-per-pf-counts dbdat run-id test-name)))
+	 (db:top-test-set-per-pf-counts dbstruct run-id test-name)))
      toplevels)))
 
-(define (db:top-test-set-per-pf-counts dbdat run-id test-name)
-  (db:general-call dbdat 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) 
+(define (db:top-test-set-per-pf-counts dbstruct run-id test-name)
+  (db:general-call (db:get-db dbstruct run-id) 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) 
  
 		     
 ;; Clean out old junk and vacuum the database
 ;;
 ;; Ultimately do something like this:
@@ -2841,11 +2841,11 @@
 (define (db:roll-up-pass-fail-counts dbstruct run-id test-name item-path state status)
   (if (not (equal? item-path ""))
       (let ((dbdat (db:get-db dbstruct run-id)))
 	;;	(db    (db:dbdat-get-db dbdat)))
 	(db:general-call dbdat 'update-pass-fail-counts (list test-name test-name test-name))
-	(db:top-test-set-per-pf-counts dbdat run-id test-name))))
+	(db:top-test-set-per-pf-counts dbstruct run-id test-name))))
   
 ;;     (case (string->symbol status)
 ;;       ((RUNNING)  (db:general-call dbdat 'top-test-set-running (list test-name)))
 ;;       ((LAUNCHED) (db:general-call dbdat 'top-test-set (list "LAUNCHED" test-name)))
 ;;       ((ABORT INCOMPLETE) (db:general-call dbdat 'top-test-set (list status test-name))))