Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -131,11 +131,14 @@
 
 ;; (db:with-db dbstruct run-id sqlite3:exec "select blah fgrom blaz;")
 ;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no
 ;;
 (define (db:with-db dbstruct run-id r/w proc . params)
-  (let* ((dbdat (db:get-db dbstruct))
+  (let* ((have-struct (dbr:dbstruct? dbstruct))
+         (dbdat (if have-struct 
+                    (db:get-db dbstruct)
+                    #f))
 	 (db    (db:dbdat-get-db dbdat))
 	 (use-mutex (> *api-process-request-count* 25)))
     (if (and use-mutex
 	     (common:low-noise-print 120 "over-50-parallel-api-requests"))
 	(debug:print-info 0 *default-log-port* *api-process-request-count* " parallel api requests being processed in process " (current-process-id) ", throttling access"))
@@ -150,11 +153,11 @@
        (exit 50))
      (if use-mutex (mutex-lock! *db-with-db-mutex*))
      (let ((res (apply proc db params)))
        (if use-mutex (mutex-unlock! *db-with-db-mutex*))
        ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w))
-       (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
+       (if dbdat (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat))
        res))))
 
 ;;======================================================================
 ;; K E E P   F I L E D B   I N   dbstruct
 ;;======================================================================
@@ -3185,20 +3188,20 @@
 	 (item-path    (db:test-get-item-path testdat))
          (tl-testdat   (db:get-test-info dbstruct run-id test-name ""))
          (tl-test-id   (db:test-get-id tl-testdat)))
     (if (member state '("LAUNCHED" "REMOTEHOSTSTART"))
 	(db:general-call dbstruct 'set-test-start-time (list test-id)))
-    ;; (mutex-lock! *db-transaction-mutex*)
+    (mutex-lock! *db-transaction-mutex*)
     (db:with-db
      dbstruct #f #f
      (lambda (db)
        (let ((tr-res
               (sqlite3:with-transaction
                db
                (lambda ()
-                 ;; (db:test-set-state-status-by-id dbstruct run-id test-id state status comment)
-                 (db:test-set-state-status dbstruct run-id test-id state status comment)
+                 ;; NB// Pass the db so it is part fo the transaction
+                 (db:test-set-state-status db run-id test-id state status comment)
                  (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item
                      (let* ((state-status-counts  (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path)) ;; item-path is used to exclude current state/status of THIS test
                             (running              (length (filter (lambda (x)
                                                                     (member (dbr:counts-state x) *common:running-states*))
                                                                   state-status-counts)))
@@ -3221,13 +3224,13 @@
                                                        "COMPLETED"
                                                        (car all-curr-states))))
                             (newstatus         (if (> bad-not-started 0)
                                                    "CHECK"
                                                    (car all-curr-statuses))))
-                       ;; (print "Setting toplevel to: " newstate "/" newstatus)
-                       (db:test-set-state-status dbstruct run-id tl-test-id newstate newstatus #f)))))))
-         ;; (mutex-unlock! *db-transaction-mutex*)
+                       ;; NB// Pass the db so it is part of the transaction
+                       (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)))))))
+         (mutex-unlock! *db-transaction-mutex*)
          (if (and test-id state status (equal? status "AUTO")) 
              (db:test-data-rollup dbstruct run-id test-id status))
          tr-res)))))
 
 (define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path)