Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -12,14 +12,14 @@
 ;; C L I E N T S
 ;;======================================================================
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 ;; (use zmq)
 
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:))
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb directory-utils)
 
 (declare (unit client))
 
@@ -50,13 +50,13 @@
     ((zmq)  (zmq:client-connect  iface port))
     (else   (rpc:client-connect  iface port))))
 
 (define (client:setup  run-id #!key (remaining-tries 10) (failed-connects 0))
   (case (server:get-transport)
-    ((rpc) (rpc-transport:client-setup run-id)) ;;(client:setup-rpc run-id))
-    ((http)(client:setup-http run-id))
-    (else  (rpc-transport:client-setup run-id)))) ;; (client:setup-rpc run-id))))
+    ((rpc) (rpc-transport:client-setup run-id remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
+    ((http)(client:setup-http run-id remaining-tries: remaining-tries failed-connects: failed-connects))
+    (else  (rpc-transport:client-setup run-id remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
 
 ;; (define (client:login-no-auto-setup server-info run-id)
 ;;   (case (server:get-transport)
 ;;     ((rpc)  (rpc:login-no-auto-client-setup server-info run-id))
 ;;     ((http) (rmt:login-no-auto-client-setup server-info run-id))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -320,15 +320,25 @@
 		(db:multi-db-sync #f 'old2new))  ;; migrate data from megatest.db automatically
 	    dbdat)))))
 
 ;; Make the dbstruct, setup up auxillary db's and call for main db at least once
 ;;
+;; called in http-transport and replicated in rmt.scm for *local* access. 
+;;
 (define (db:setup run-id #!key (local #f))
   (let* ((dbdir    (db:dbfile-path #f)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
 	 (dbstruct (make-dbr:dbstruct path: dbdir local: local)))
     dbstruct))
 
+;; open the local db for direct access (no server)
+;;
+(define (db:open-local-db-handle)
+  (or *dbstruct-db*
+      (let ((dbstruct (db:setup #f local: #t)))
+	(set! *dbstruct-db* dbstruct)
+	dbstruct)))
+	  
 ;; Open the classic megatest.db file in toppath
 ;;
 (define (db:open-megatest-db)
   (let* ((dbpath       (conc *toppath* "/megatest.db"))
 	 (dbexists     (file-exists? dbpath))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -225,18 +225,13 @@
 				 (cons newmax-cmd currmax)
 				 (cons 'none 0))
 			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
     (mutex-unlock! *db-stats-mutex*)
     res))
-	  
+
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
-  (let* ((dbstruct-local (if *dbstruct-db*
-			     *dbstruct-db*
-			     (let* ((dbdir (db:dbfile-path #f)) ;;  (conc    (configf:lookup *configdat* "setup" "linktree") "/.db"))
-				    (db (make-dbr:dbstruct path:  dbdir local: #t)))
-			       (set! *dbstruct-db* db)
-			       db)))
+  (let* ((dbstruct-local (db:open-local-db-handle))
 	 (db-file-path   (db:dbfile-path 0))
 	 ;; (read-only      (not (file-read-access? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (api:execute-requests dbstruct-local (vector (symbol->string cmd) params)))
 	 (success        (vector-ref resdat 0))