Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -14,15 +14,23 @@
 (declare (uses db))
 
 ;; These are called by the server on recipt of /api calls
 
 (define (api:execute-requests db cmd params)
+  (debug:print-info 1 "api:execute-requests cmd=" cmd " params=" params)
   (case (string->symbol cmd)
+    ;; KEYS
+    ((get-key-val-pairs)            (apply db:get-key-val-pairs db params))
+    ;; TESTS
     ;; json doesn't do vectors, convert to list
     ((get-test-info-by-id)	    (vector->list (apply db:get-test-info-by-id db params)))
-    ((get-key-val-pairs)            (apply db:get-key-val-pairs db params))
     ((test-get-rundir-from-test-id) (apply db:test-get-rundir-from-test-id db params))
+    ((testmeta-get-record)          (vector->list (apply db:testmeta-get-record db params)))
+    ;; RUNS
+    ((get-run-info)                 (let ((res (apply db:get-run-info db params)))
+				      (list (vector-ref res 0)
+					    (vector->list (vector-ref res 1)))))
     (else
      (list "ERROR" 0))))
 
 ;; http-server  send-response
 ;;                 api:process-request
@@ -34,9 +42,12 @@
   (let* ((cmd     ($ 'cmd))
 	 (paramsj ($ 'params))
 	 (params  (rmt:json-str->dat paramsj))
 	 (res     (api:execute-requests db cmd params)))
     (rmt:dat->json-str
-     (if (string? res)
+     (if (or (string? res)
+	     (list?   res)
+	     (number? res)
+	     (boolean? res))
 	 res 
-	 (list "ERROR" 1 cmd params)))))
+	 (list "ERROR" 1 cmd params res)))))
 

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -357,11 +357,11 @@
 	(begin
 	  (debug:print 0 "ERROR: No test data found for test " test-id ", exiting")
 	  (exit 1))
 	(let* ((run-id        (if testdat (db:test-get-run_id testdat) #f))
 	       (keydat        (if testdat (rmt:get-key-val-pairs run-id) #f))
-	       (rundat        (if testdat (cdb:remote-run db:get-run-info #f run-id) #f))
+	       (rundat        (if testdat (rmt:get-run-info run-id) #f))
 	       (runname       (if testdat (db:get-value-by-header (db:get-row rundat)
 								  (db:get-header rundat)
 								  "runname") #f))
 	       ;; These next two are intentional bad values to ensure errors if they should not
 	       ;; get filled in properly.
@@ -369,11 +369,11 @@
 	       (rundir        logfile)
 	       (teststeps     (if testdat (dashboard-tests:get-compressed-steps test-id work-area: rundir) '()))
 	       (testfullname  (if testdat (db:test-get-fullname testdat) "Gathering data ..."))
 	       (testname      (if testdat (db:test-get-testname testdat) "n/a"))
 	       (testmeta      (if testdat 
-				  (let ((tm (cdb:remote-run db:testmeta-get-record #f testname)))
+				  (let ((tm (rmt:testmeta-get-record testname)))
 				    (if tm tm (make-db:testmeta)))
 				  (make-db:testmeta)))
 
 	       (keystring  (string-intersperse 
 			    (map (lambda (keyval)
@@ -409,11 +409,11 @@
 						       request-update))
 				    (newtestdat (if need-update 
 						    (handle-exceptions
 						     exn 
 						     (debug:print-info 2 "test db access issue: " ((condition-property-accessor 'exn 'message) exn))
-						     (cdb:remote-run db:get-test-info-by-id #f test-id )))))
+						     (rmt:get-test-info-by-id test-id )))))
 			       (cond
 				((and need-update newtestdat)
 				 (set! testdat newtestdat)
 				 (set! teststeps    (dashboard-tests:get-compressed-steps test-id work-area: rundir))
 				 (set! logfile      (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))
@@ -586,11 +586,11 @@
 											      (db:test-data-get-tol      x)
 											      (db:test-data-get-status   x)
 											      (db:test-data-get-units    x)
 											      (db:test-data-get-type     x)
 											      (db:test-data-get-comment  x)))
-										    (cdb:remote-run db:read-test-data #f test-id "%")))
+										    (rmt:read-test-data test-id "%")))
 									      "\n")))
 							       (if (not (equal? currval newval))
 								   (iup:attribute-set! test-data "VALUE" newval ))))) ;; "TITLE" newval)))))
 					  test-data))
 				       ;;(dashboard:run-controls)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1915,24 +1915,10 @@
 	       (sqlite3:execute tdb "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment,status,type) VALUES (?,?,?,?,?,?,?,?,?,?);"
 				test-id category variable value expected tol units (if comment comment "") status type)))
 	   csvlist)
 	  (sqlite3:finalize! tdb)))))
 
-;; get a list of test_data records matching categorypatt
-(define (db:read-test-data db test-id categorypatt #!key (work-area #f))
-  (let ((tdb  (db:open-test-db-by-test-id db test-id work-area: work-area)))
-    (if tdb
-	(let ((res '()))
-	  (sqlite3:for-each-row 
-	   (lambda (id test_id category variable value expected tol units comment status type)
-	     (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
-	   tdb
-	   "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
-	  (sqlite3:finalize! tdb)
-	  (reverse res))
-	'())))
-
 ;; NOTE: Run this local with #f for db !!!
 (define (db:load-test-data db test-id #!key (work-area #f))
   (let loop ((lin (read-line)))
     (if (not (eof-object? lin))
 	(begin

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -15,12 +15,16 @@
 (declare (uses api))
 (declare (uses tdb))
 (declare (uses http-transport))
 
 ;;
-;; These are all called on the client side
+;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
+
+;;======================================================================
+;;  S U P P O R T   F U N C T I O N S
+;;======================================================================
 
 ;; cmd is a symbol
 ;; vars is a json string encoding the parameters for the call
 ;;
 (define (rmt:send-receive cmd params)
@@ -50,33 +54,56 @@
 (define (rmt:json-str->dat json-str)
   (with-input-from-string json-str
     (lambda ()
       (json-read))))
 
+;;======================================================================
 ;;
-;; Actual api calls 
+;; A C T U A L   A P I   C A L L S  
 ;;
+;;======================================================================
+
+;;======================================================================
+;;  K E Y S 
+;;======================================================================
+
+(define (rmt:get-key-val-pairs run-id)
+  (rmt:send-receive 'get-key-val-pairs (list run-id)))
+
+;;======================================================================
+;;  T E S T S
+;;======================================================================
 
 (define (rmt:get-test-info-by-id test-id)
   (list->vector
    (rmt:send-receive 'get-test-info-by-id (list test-id))))
 
-(define (rmt:get-key-val-pairs run-id)
-  (rmt:send-receive 'get-key-val-pairs (list run-id)))
-
 (define (rmt:test-get-rundir-from-test-id test-id)
   (rmt:send-receive 'test-get-rundir-from-test-id (list test-id)))
 
 (define (rmt:open-test-db-by-test-id test-id #!key (work-area #f))
   (let* ((test-path (if (string? work-area)
 			work-area
 			(rmt:test-get-rundir-from-test-id test-id))))
     (debug:print 3 "TEST PATH: " test-path)
     (open-test-db test-path)))
+
+(define (rmt:testmeta-get-record testname)
+  (list->vector
+   (rmt:send-receive 'testmeta-get-record (list testname))))
+
+;;======================================================================
+;;  R U N S
+;;======================================================================
+
+(define (rmt:get-run-info run-id)
+  (let ((res (rmt:send-receive 'get-run-info (list run-id))))
+    (vector (car res)
+	    (list->vector (cadr res)))))
 
 ;;======================================================================
-;; S T E P S
+;;  S T E P S
 ;;======================================================================
 
 ;; Getting steps is more complicated.
 ;;
 ;; If given work area 
@@ -89,5 +116,15 @@
 (define (rmt:get-steps-for-test test-id #!key (work-area #f))
   (let* ((tdb (rmt:open-test-db-by-test-id test-id work-area: work-area)))
     (if tdb
 	(tdb:get-steps-data tdb test-id)
 	'())))
+
+;;======================================================================
+;;  T E S T   D A T A 
+;;======================================================================
+
+(define (rmt:read-test-data test-id categorypatt #!key (work-area #f)) 
+  (let ((tdb  (rmt:open-test-db-by-test-id test-id work-area: work-area)))
+    (if tdb
+	(tdb:read-test-data tdb test-id categorypatt)
+	'())))

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -50,5 +50,15 @@
      tdb
      "SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
      test-id)
     (sqlite3:finalize! tdb)
     (reverse res)))
+
+(define (tdb:read-test-data tdb test-id categorypatt)
+  (let ((res '()))
+    (sqlite3:for-each-row 
+     (lambda (id test_id category variable value expected tol units comment status type)
+       (set! res (cons (vector id test_id category variable value expected tol units comment status type) res)))
+     tdb
+     "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
+    (sqlite3:finalize! tdb)
+    (reverse res)))