@@ -65,56 +65,56 @@
 (define (dbr:dbstruct-localdb-set! v run-id db)
   (hash-table-set! (dbr:dbstruct-locdbs v) run-id db))
 
 
 (define (make-db:test)(make-vector 20))
-(define-inline (db:test-id           vec) (vector-ref vec 0))
-(define-inline (db:test-run_id       vec) (vector-ref vec 1))
-(define-inline (db:test-testname     vec) (vector-ref vec 2))
-(define-inline (db:test-state        vec) (vector-ref vec 3))
-(define-inline (db:test-status       vec) (vector-ref vec 4))
-(define-inline (db:test-event_time   vec) (vector-ref vec 5))
-(define-inline (db:test-host         vec) (vector-ref vec 6))
-(define-inline (db:test-cpuload      vec) (vector-ref vec 7))
-(define-inline (db:test-diskfree     vec) (vector-ref vec 8))
-(define-inline (db:test-uname        vec) (vector-ref vec 9))
-;; (define-inline (db:test-rundir       vec) (sdb:qry 'getstr (vector-ref vec 10)))
-(define-inline (db:test-rundir       vec) (vector-ref vec 10))
-(define-inline (db:test-item-path    vec) (vector-ref vec 11))
-(define-inline (db:test-run_duration vec) (vector-ref vec 12))
-(define-inline (db:test-final_logf   vec) (vector-ref vec 13))
-(define-inline (db:test-comment      vec) (vector-ref vec 14))
-(define-inline (db:test-process_id   vec) (vector-ref vec 16))
-(define-inline (db:test-archived     vec) (vector-ref vec 17))
-
-;; (define-inline (db:test-pass_count   vec) (vector-ref vec 15))
-;; (define-inline (db:test-fail_count   vec) (vector-ref vec 16))
-(define-inline (db:test-fullname     vec)
-  (conc (db:test-testname vec) "/" (db:test-item-path vec)))
+(define-inline (dbr:test-id           vec) (vector-ref vec 0))
+(define-inline (dbr:test-run_id       vec) (vector-ref vec 1))
+(define-inline (dbr:test-testname     vec) (vector-ref vec 2))
+(define-inline (dbr:test-state        vec) (vector-ref vec 3))
+(define-inline (dbr:test-status       vec) (vector-ref vec 4))
+(define-inline (dbr:test-event_time   vec) (vector-ref vec 5))
+(define-inline (dbr:test-host         vec) (vector-ref vec 6))
+(define-inline (dbr:test-cpuload      vec) (vector-ref vec 7))
+(define-inline (dbr:test-diskfree     vec) (vector-ref vec 8))
+(define-inline (dbr:test-uname        vec) (vector-ref vec 9))
+;; (define-inline (dbr:test-rundir       vec) (sdb:qry 'getstr (vector-ref vec 10)))
+(define-inline (dbr:test-rundir       vec) (vector-ref vec 10))
+(define-inline (dbr:test-item-path    vec) (vector-ref vec 11))
+(define-inline (dbr:test-run_duration vec) (vector-ref vec 12))
+(define-inline (dbr:test-final_logf   vec) (vector-ref vec 13))
+(define-inline (dbr:test-comment      vec) (vector-ref vec 14))
+(define-inline (dbr:test-process_id   vec) (vector-ref vec 16))
+(define-inline (dbr:test-archived     vec) (vector-ref vec 17))
+
+;; (define-inline (dbr:test-pass_count   vec) (vector-ref vec 15))
+;; (define-inline (dbr:test-fail_count   vec) (vector-ref vec 16))
+(define-inline (dbr:test-fullname     vec)
+  (conc (dbr:test-testname vec) "/" (dbr:test-item-path vec)))
 
 ;; replace runs:make-full-test-name with this routine
 (define (db:test-make-full-name testname itempath)
   (if (equal? itempath "") testname (conc testname "/" itempath)))
 
-(define-inline (db:test-first_err    vec) (printable (vector-ref vec 15)))
-(define-inline (db:test-first_warn   vec) (printable (vector-ref vec 16)))
-
-(define-inline (db:test-cpuload-set!  vec val)(vector-set! vec 7 val))
-(define-inline (db:test-diskfree-set! vec val)(vector-set! vec 8 val))
-(define-inline (db:test-testname-set! vec val)(vector-set! vec 2 val))
-(define-inline (db:test-state-set!    vec val)(vector-set! vec 3 val))
-(define-inline (db:test-status-set!   vec val)(vector-set! vec 4 val))
-(define-inline (db:test-run_duration-set! vec val)(vector-set! vec 12 val))
-(define-inline (db:test-final_logf-set! vec val)(vector-set! vec 13 val))
+(define-inline (dbr:test-first_err    vec) (printable (vector-ref vec 15)))
+(define-inline (dbr:test-first_warn   vec) (printable (vector-ref vec 16)))
+
+(define-inline (dbr:test-cpuload-set!  vec val)(vector-set! vec 7 val))
+(define-inline (dbr:test-diskfree-set! vec val)(vector-set! vec 8 val))
+(define-inline (dbr:test-testname-set! vec val)(vector-set! vec 2 val))
+(define-inline (dbr:test-state-set!    vec val)(vector-set! vec 3 val))
+(define-inline (dbr:test-status-set!   vec val)(vector-set! vec 4 val))
+(define-inline (dbr:test-run_duration-set! vec val)(vector-set! vec 12 val))
+(define-inline (dbr:test-final_logf-set! vec val)(vector-set! vec 13 val))
 
 ;; Test record utility functions
 
 ;; Is a test a toplevel?
 ;;
 (define (db:test-is-toplevel vec)
-  (and (equal? (db:test-item-path vec) "")      ;; test is not an item
-       (equal? (db:test-uname vec)     "n/a"))) ;; test has never been run
+  (and (equal? (dbr:test-item-path vec) "")      ;; test is not an item
+       (equal? (dbr:test-uname vec)     "n/a"))) ;; test has never been run
 
 ;; make-vector-record "" db mintest id run_id testname state status event_time item_path
 ;;
 (define (make-db:mintest)(make-vector 7))
 (define-inline (db:mintest-get-id           vec)    (vector-ref  vec 0))