Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -4,5 +4,8 @@
 bin/*
 tests/megatest.db
 tests/monitor.db
 megatest
 dboard
+tests/fullrun/tmp/*
+tests/simpleruns
+tests/simplelinks

Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -4,11 +4,12 @@
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm \
            ods.scm runconfig.scm server.scm configf.scm \
            db.scm keys.scm margs.scm megatest-version.scm \
            process.scm runs.scm tasks.scm tests.scm genexample.scm \
-	   fs-transport.scm zmq-transport.scm http-transport.scm
+	   fs-transport.scm zmq-transport.scm http-transport.scm \
+           client.scm
 
 GUISRCF  = dashboard.scm dashboard-tests.scm dashboard-guimonitor.scm dashboard-main.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)

ADDED   client.scm
Index: client.scm
==================================================================
--- /dev/null
+++ client.scm
@@ -0,0 +1,117 @@
+
+;; Copyright 2006-2012, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;======================================================================
+;; 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 zmq)
+(import (prefix sqlite3 sqlite3:))
+
+(use spiffy uri-common intarweb http-client spiffy-request-vars)
+
+(declare (unit client))
+
+(declare (uses common))
+(declare (uses db))
+(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+
+(include "common_records.scm")
+(include "db_records.scm")
+
+;; client:get-signature
+(define (client:get-signature)
+  (if *my-client-signature* *my-client-signature*
+      (let ((sig (server:mk-signature)))
+	(set! *my-client-signature* sig)
+	*my-client-signature*)))
+
+;; client:login serverdat
+(define (client:login serverdat)
+  (cdb:login serverdat *toppath* (client:get-signature)))
+
+;; Not currently used! But, I think it *should* be used!!!
+(define (client:logout serverdat)
+  (let ((ok (and (socket? serverdat)
+		 (cdb:logout serverdat *toppath* (client:get-signature)))))
+    ok))
+
+;; Do all the connection work, look up the transport type and set up the
+;; connection if required.
+;;
+;; There are two scenarios. 
+;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
+;;   2. We are a run tests, list runs or other interactive process and we mush figure out
+;;      *transport-type* and *runremote* from the monitor.db
+;;
+;; client:setup
+(define (client:setup #!key (numtries 50))
+  (if (not *toppath*)
+      (if (not (setup-for-run))
+	  (begin
+	    (debug:print 0 "ERROR: failed to find megatest.config, exiting")
+	    (exit))))
+  (debug:print-info 11 "*transport-type* is " *transport-type* ", *runremote* is " *runremote*)
+  (let* ((hostinfo  (if (not *transport-type*) ;; If we dont' already have transport type set then figure it out
+			(open-run-close tasks:get-best-server tasks:open-db)
+			#f)))
+    ;; if have hostinfo then extract the transport type 
+    ;; else fall back to fs
+    (debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo)
+    (set! *transport-type* (if hostinfo 
+    			       (string->symbol (tasks:hostinfo-get-transport hostinfo))
+			       'fs))
+    ;; ;; DEBUG STUFF
+    ;; (if (eq? *transport-type* 'fs)(begin (print "ERROR!!!!!!! refusing to run with transport " *transport-type*)(exit 99)))
+    
+    (debug:print-info 11 "Using transport type of " *transport-type* (if hostinfo (conc " to connect to " hostinfo) ""))
+    (case *transport-type* 
+      ((fs)(if (not *megatest-db*)(set! *megatest-db* (open-db))))
+      ((http)
+       (http-transport:client-connect (tasks:hostinfo-get-interface hostinfo)
+				      (tasks:hostinfo-get-port hostinfo)))
+      ((zmq)
+       (zmq-transport:client-connect (tasks:hostinfo-get-interface hostinfo)
+				     (tasks:hostinfo-get-port      hostinfo)
+				     (tasks:hostinfo-get-pubport   hostinfo)))
+      (else  ;; default to fs
+       (debug:print 0 "ERROR: unrecognised transport type " *transport-type* " attempting to continue with fs")
+       (set! *transport-type* 'fs)
+       (set! *megatest-db*    (open-db))))))
+
+;; client:signal-handler
+(define (client:signal-handler signum)
+  (handle-exceptions
+   exn
+   (debug:print " ... exiting ...")
+   (let ((th1 (make-thread (lambda ()
+			     "") ;; do nothing for now (was flush out last call if applicable)
+			   "eat response"))
+	 (th2 (make-thread (lambda ()
+			     (debug:print 0 "ERROR: Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
+			     (thread-sleep! 1) ;; give the flush one second to do it's stuff
+			     (debug:print 0 "       Done.")
+			     (exit 4))
+			   "exit on ^C timer")))
+     (thread-start! th2)
+     (thread-start! th1)
+     (thread-join! th2))))
+
+;; client:launch
+(define (client:launch)
+  (set-signal-handler! signal/int client:signal-handler)
+   (if (client:setup)
+       (debug:print-info 2 "connected as client")
+       (begin
+	 (debug:print 0 "ERROR: Failed to connect as client")
+	 (exit))))
+

ADDED   commonstructs
Index: commonstructs
==================================================================
--- /dev/null
+++ commonstructs
@@ -0,0 +1,18 @@
+
+The database keys, runs are indexed on this
+keys: (db:get-keys #f) =>
+
+      (#("OS"  "TEXT") 
+       #("FS"  "TEXT") 
+       #("TAG" "TEXT"))
+
+keyvallst: (keys:target->keyval keys "ubuntu/nfs/none")
+
+      (("OS"  "ubuntu")
+       ("FS"  "nfs")
+       ("TAG" "none"))
+
+keyvals: (db:get-key-vals #f 3) ;; get the key vals for run #3
+
+      ("ubuntu" "nfs" "none")
+

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -127,11 +127,11 @@
 ;; adds to ht if given (must be #f otherwise)
 ;; envion-patt is a regex spec that identifies sections that will be eval'd
 ;; in the environment on the fly
 ;; sections: #f => get all, else list of sections to gather
 (define (read-config path ht allow-system #!key (environ-patt #f)(curr-section #f)(sections #f))
-  (debug:print-info 4 "read-config " path " allow-system " allow-system " environ-patt " environ-patt " curr-section: " curr-section " sections: " sections)
+  (debug:print-info 5 "read-config " path " allow-system " allow-system " environ-patt " environ-patt " curr-section: " curr-section " sections: " sections " pwd: " (current-directory))
   (if (not (file-exists? path))
       (begin 
 	(debug:print-info 4 "read-config - file not found " path " current path: " (current-directory))
 	(if (not ht)(make-hash-table) ht))
       (let ((inp        (open-input-file path))

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -82,16 +82,16 @@
 (define *db* #f) ;; (open-db))
 
 (if (args:get-arg "-host")
     (begin
       (set! *runremote* (string-split (args:get-arg "-host" ":")))
-      (server:client-launch))
-    (server:client-launch))
+      (client:launch))
+    (client:launch))
 
 ;; HACK ALERT: this is a hack, please fix.
 (define *read-only* (not (file-read-access? (conc *toppath* "/megatest.db"))))
-;; (server:client-setup *db*)
+;; (client:setup *db*)
 
 (define toplevel #f)
 (define dlg      #f)
 (define max-test-num 0)
 ;; (define *keys*   (open-run-close db:get-keys #f))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -26,10 +26,11 @@
 (declare (unit db))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses fs-transport))
+(declare (uses client))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
@@ -969,24 +970,36 @@
 ;; Misc. test related queries
 ;;======================================================================
 
 ;; MUST BE CALLED local!
 (define (db:test-get-paths-matching db keynames target fnamepatt #!key (res '()))
-  (let ((paths-from-db (cdb:remote-run db:test-get-paths-matching-keynames-target db keynames target res)))
-    (if fnamepatt
-	(apply append 
-	       (map (lambda (p)
-		      (glob (conc p "/" fnamepatt)))
-		    paths-from-db))
-	paths-from-db)))
-
-(define (db:test-get-paths-matching-keynames-target db keynames target res)
+  ;; BUG: Move the values derived from args to parameters and push to megatest.scm
   (let* ((testpatt   (if (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%"))
 	 (statepatt  (if (args:get-arg ":state")   (args:get-arg ":state")    "%"))
 	 (statuspatt (if (args:get-arg ":status")  (args:get-arg ":status")   "%"))
 	 (runname    (if (args:get-arg ":runname") (args:get-arg ":runname")  "%"))
-	 (keystr (string-intersperse 
+	 (paths-from-db (cdb:remote-run db:test-get-paths-matching-keynames-target db keynames target res
+					testpatt:   testpatt
+					statepatt:  statepatt
+					statuspatt: statuspatt
+					runname:    runname)))
+    (if fnamepatt
+	(apply append 
+	       (map (lambda (p)
+		      (if (directory-exists? p)
+			  (glob (conc p "/" fnamepatt))
+			  '()))
+		    paths-from-db))
+	paths-from-db)))
+
+(define (db:test-get-paths-matching-keynames-target db keynames target res 
+						    #!key
+						    (testpatt   "%")
+						    (statepatt  "%")
+						    (statuspatt "%")
+						    (runname    "%"))
+  (let* ((keystr (string-intersperse 
 		  (map (lambda (key val)
 			 (conc "r." key " like '" val "'"))
 		       keynames 
 		       (string-split target "/"))
 		  " AND "))
@@ -1083,11 +1096,11 @@
   (case *transport-type* 
     ((fs)
      (let ((packet (vector "na" qtype immediate "na" params 0)))
        (fs:process-queue-item packet)))
     ((http)
-     (let* ((client-sig  (server:get-client-signature))
+     (let* ((client-sig  (client:get-signature))
 	    (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
 	    (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds))))) ;; (with-output-to-string (lambda ()(serialize params))))
        (debug:print-info 11 "zdat=" zdat)
        (let* ((res  #f)
 	      (rawdat      (http-transport:client-send-receive serverdat zdat))
@@ -1101,21 +1114,21 @@
       (begin
 	(thread-sleep! 5) 
 	(if (> numretries 0)(apply cdb:client-call serverdat qtype immediate (- numretries 1) params)))
       (let* ((push-socket (vector-ref serverdat 0))
 	     (sub-socket  (vector-ref serverdat 1))
-	     (client-sig  (server:get-client-signature))
+	     (client-sig  (client:get-signature))
 	     (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
 	     (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds)))) ;; (with-output-to-string (lambda ()(serialize params))))
 	     (res  #f)
 	     (send-receive (lambda ()
 			     (debug:print-info 11 "sending message")
 			     (send-message push-socket zdat)
 			     (debug:print-info 11 "message sent")
 			     (let loop ()
 			       ;; get the sender info
-			       ;; this should match (server:get-client-signature)
+			       ;; this should match (client:get-signature)
 			       ;; we will need to process "all" messages here some day
 			       (receive-message* sub-socket)
 			       ;; now get the actual message
 			       (let ((myres (db:string->obj (receive-message* sub-socket))))
 				 (if (equal? query-sig (vector-ref myres 1))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -185,11 +185,11 @@
 	     final)))))))
 
 (define (http-transport:client-connect iface port)
   (let* ((login-res   #f)
 	 (serverdat   (list iface port)))
-    (set! login-res (server:client-login serverdat))
+    (set! login-res (client:login serverdat))
     (if (and (not (null? login-res))
 	     (car login-res))
 	(begin
 	  (debug:print-info 2 "Logged in and connected to " iface ":" port)
 	  (set! *runremote* serverdat)

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -61,10 +61,12 @@
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
 	       ;; (runremote (assoc/default 'runremote cmdinfo))
 	       (transport (assoc/default 'transport cmdinfo))
+	       (serverinf (assoc/default 'serverinf cmdinfo))
+	       (port      (assoc/default 'port      cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (target    (assoc/default 'target    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (env-ovrd  (assoc/default 'env-ovrd  cmdinfo))
@@ -118,11 +120,11 @@
 		(debug:print 0 "Failed to setup, exiting") 
 		;; (sqlite3:finalize! db)
 		;; (sqlite3:finalize! tdb)
 		(exit 1)))
 	  ;; Can setup as client for server mode now
-	  ;; (server:client-setup)
+	  ;; (client:setup)
 
 	  (change-directory *toppath*) 
 	  (set-megatest-env-vars run-id) ;; these may be needed by the launching process
 	  (change-directory work-area) 
 
@@ -585,10 +587,11 @@
 		    (with-output-to-string
 		      (lambda () ;; (list 'hosts     hosts)
 			(write (list (list 'testpath  test-path)
 				     ;; (list 'runremote *runremote*)
 				     (list 'transport (conc *transport-type*))
+				     (list 'serverinf *server-info*)
 				     (list 'toppath   *toppath*)
 				     (list 'work-area work-area)
 				     (list 'test-name test-name) 
 				     (list 'runscript runscript) 
 				     (list 'run-id    run-id   )

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two digit decimal
 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.5301)
+(define megatest-version 1.5302)
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -8,11 +8,11 @@
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos ) ;; (srfi 18) extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json) ;; (srfi 18) extras)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (use zmq)
 
@@ -20,10 +20,11 @@
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
+(declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
@@ -93,10 +94,11 @@
   -list-disks             : list the disks available for storing runs
   -list-targets           : list the targets in runconfigs.config
   -list-db-targets        : list the target combinations used in the db
   -show-config            : dump the internal representation of the megatest.config file
   -show-runconfig         : dump the internal representation of the runconfigs.config file
+  -dumpmode json          : dump in json format instead of sexpr
 
 Misc 
   -rebuild-db             : bring the database schema up to date
   -update-meta            : update the tests metadata for all tests
   -env2file fname         : write the environment to fname.csh and fname.sh
@@ -179,10 +181,11 @@
 			"-debug" ;; for *verbosity* > 2
 			"-gen-megatest-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
 			"-load"        ;; load and exectute a scheme file
+			"-dumpmode"
 			) 
 		 (list  "-h"
 			"-version"
 		        "-force"
 		        "-xterm"
@@ -330,11 +333,11 @@
     ;; if not list or kill then start a client (if appropriate)
     (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 	    (eq? (length (hash-table-keys args:arg-hash)) 0))
 	(debug:print-info 1 "Server connection not needed")
 	;; ok, so lets connect to the server
-	(server:client-launch)))
+	(client:launch)))
 
 ;;======================================================================
 ;; Weird special calls that need to run *after* the server has started?
 ;;======================================================================
 
@@ -346,19 +349,38 @@
 		  (print x))
 		targets)
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-show-runconfig")
-    (begin
+    (let* ((target (if (args:get-arg "-reqtarg")
+		       (args:get-arg "-reqtarg")
+		       (if (args:get-arg "-target")
+			   (args:get-arg "-target")
+			   #f)))
+	   (sections (if target (list "default" target) #f))
+	   (data     (read-config "runconfigs.config" #f #t sections: sections)))
+
       ;; keep this one local
-      (pp (hash-table->alist (open-run-close setup-env-defaults #f "runconfigs.config" #f #f change-env: #f)))
+      (cond
+       ((not (args:get-arg "-dumpmode"))
+	(pp (hash-table->alist data)))
+       ((string=? (args:get-arg "-dumpmode") "json")
+	(json-write data))
+       (else
+	(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-show-config")
-    (begin
+    (let ((data (read-config "megatest.config" #f #t)))
       ;; keep this one local
-      (pp (hash-table->alist (open-run-close setup-env-defaults #f "megatest.config" #f #f change-env: #f)))
+      (cond 
+       ((not (args:get-arg "-dumpmode"))
+	(pp (hash-table->alist data)))
+       ((string=? (args:get-arg "-dumpmode") "json")
+	(json-write data))
+       (else
+	(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
@@ -781,11 +803,11 @@
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")
 		(exit 1)))
 
 	  ;; can setup as client for server mode now
-	  ;; (server:client-setup)
+	  ;; (client:setup)
 
 	  (if (args:get-arg "-load-test-data")
 	      ;; has sub commands that are rdb:
 	      ;; DO NOT put this one into either cdb:remote-run or open-run-close
 	      (db:load-test-data db test-id))
@@ -942,12 +964,12 @@
 	   (db      (if toppath (open-db) #f)))
       (if db
 	  (begin
 	    (set! *db* db)
 	    (set! *client-non-blocking-mode* #t)
-	    ;; (server:client-setup)
-	    ;; (server:client-launch)
+	    ;; (client:setup)
+	    ;; (client:launch)
 	    (import readline)
 	    (import apropos)
 	    (gnu-history-install-file-manager
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -25,11 +25,11 @@
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 
 (include "common_records.scm")
 (include "db_records.scm")
 
-(define (server:make-server-url hostport)
+(define (rpc-server:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
 (define  *server-loop-heart-beat* (current-seconds))
@@ -42,11 +42,11 @@
 ;; Call this to start the actual server
 ;;
 
 (define *db:process-queue-mutex* (make-mutex))
 
-(define (server:run hostn)
+(define (rpc-server:run hostn)
   (debug:print 2 "Attempting to start the server ...")
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: cannot find megatest.config, cannot start server, exiting")
@@ -108,11 +108,11 @@
     ;; lite3:finalize! db)))
     ))
 
 
 
-;; (define (server:main-loop)
+;; (define (rpc-server:main-loop)
 ;;   (print "INFO: Exectuing main server loop")
 ;;   (access-log "megatest-http.log")
 ;;   (server-bind-address #f)
 ;;   (define-page (main-page-path)
 ;;     (lambda ()
@@ -144,11 +144,11 @@
 ;;; 
 ;;; (start-server port: 12345)
 
 ;; This is recursively run by server:run until sucessful
 ;;
-(define (server:try-start-server ipaddrstr portnum)
+(define (rpc-server:try-start-server ipaddrstr portnum)
   (handle-exceptions
    exn
    (begin
      (print-error-message exn)
      (if (< portnum 9000)
@@ -167,11 +167,11 @@
    (print "INFO: Trying to start server on " ipaddrstr ":" portnum)
    ;; This starts the spiffy server
    (start-server port: portnum)
    (print "INFO: server has been stopped")))
 
-(define (server:mk-signature)
+(define (rpc-server:mk-signature)
   (message-digest-string (md5-primitive) 
 			 (with-output-to-string
 			   (lambda ()
 			     (write (list (current-directory)
 					  (argv)))))))
@@ -181,31 +181,25 @@
 ;;======================================================================
 
 ;; When using zmq this would send the message back (two step process)
 ;; with spiffy or rpc this simply returns the return data to be returned
 ;; 
-(define (server:reply return-addr query-sig success/fail result)
+(define (rpc-server:reply return-addr query-sig success/fail result)
   (debug:print-info 11 "server:reply return-addr=" return-addr ", result=" result)
   ;; (send-message pubsock target send-more: #t)
   ;; (send-message pubsock 
   (db:obj->string (vector success/fail query-sig result)))
 
 ;;======================================================================
 ;; C L I E N T S
 ;;======================================================================
 
-(define (server:get-client-signature)
-  (if *my-client-signature* *my-client-signature*
-      (let ((sig (server:mk-signature)))
-	(set! *my-client-signature* sig)
-	*my-client-signature*)))
-
 ;; <html>
 ;; <head></head>
 ;; <body>1 Hello, world! Goodbye Dolly</body></html>
 ;; Send msg to serverdat and receive result
-(define (server:client-send-receive serverdat msg)
+(define (rpc-server:client-send-receive serverdat msg)
   (let* ((url        (server:make-server-url serverdat))
 	 (fullurl    (conc url "/ctrl")) ;; (conc url "/?dat=" msg)))
 	 (numretries 0))     
     (handle-exceptions
      exn
@@ -232,25 +226,25 @@
 	   (debug:print-info 11 "match=" match)
 	   (let ((final (cadr match)))
 	     (debug:print-info 11 "final=" final)
 	     final)))))))
 
-(define (server:client-login serverdat)
+(define (client:login serverdat serverdat)
   (max-retry-attempts 100)
-  (cdb:login serverdat *toppath* (server:get-client-signature)))
+  (cdb:login serverdat *toppath* (client:get-signature)))
 
 ;; Not currently used! But, I think it *should* be used!!!
-(define (server:client-logout serverdat)
+(define (client:logout serverdat)
   (let ((ok (and (socket? serverdat)
-		 (cdb:logout serverdat *toppath* (server:get-client-signature)))))
+		 (cdb:logout serverdat *toppath* (client:get-signature)))))
     ;; (close-socket serverdat)
     ok))
 
-(define (server:client-connect iface port)
+(define (rpc-server:client-connect iface port)
   (let* ((login-res   #f)
 	 (serverdat   (list iface port)))
-    (set! login-res (server:client-login serverdat))
+    (set! login-res (client:login serverdat serverdat))
     (if (and (not (null? login-res))
 	     (car login-res))
 	(begin
 	  (debug:print-info 2 "Logged in and connected to " iface ":" port)
 	  (set! *runremote* serverdat)
@@ -259,11 +253,11 @@
 	  (debug:print-info 2 "Failed to login or connect to " iface ":" port)
 	  (set! *runremote* #f)
 	  #f))))
 
 ;; Do all the connection work, start a server if not already running
-(define (server:client-setup #!key (numtries 50))
+(define (client:setup #!key (numtries 50))
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: failed to find megatest.config, exiting")
 	    (exit))))
@@ -295,17 +289,17 @@
 			(sleep 2) ;; give server time to start
 			(if (< count 5)
 			    (loop (+ count 1)))))))
 	      ;; we are starting a server, do not try again! That can lead to 
 	      ;; recursively starting many processes!!!
-	      (server:client-setup numtries: 0))
+	      (client:setup numtries: 0))
 	    (debug:print-info 1 "Too many attempts, giving up")))))
 
 ;; run server:keep-running in a parallel thread to monitor that the db is being 
 ;; used and to shutdown after sometime if it is not.
 ;;
-(define (server:keep-running)
+(define (rpc-server:keep-running)
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (let* ((server-info (let loop ()
                         (let ((sdat #f))
@@ -356,11 +350,11 @@
               (debug:print-info 0 "Max cached queries was " *max-cache-size*)
               (debug:print-info 0 "Server shutdown complete. Exiting")
               (exit)))))))
 
 ;; all routes though here end in exit ...
-(define (server:launch)
+(define (rpc-server:launch)
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: cannot find megatest.config, exiting")
 	    (exit))))
@@ -383,30 +377,5 @@
 	      (thread-join! th2)
 	      )
 	    (debug:print 0 "ERROR: Failed to setup for megatest")))
     (exit)))
 
-(define (server:client-signal-handler signum)
-  (handle-exceptions
-   exn
-   (debug:print " ... exiting ...")
-   (let ((th1 (make-thread (lambda ()
-			     "") ;; do nothing for now (was flush out last call if applicable)
-			   "eat response"))
-	 (th2 (make-thread (lambda ()
-			     (debug:print 0 "ERROR: Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
-			     (thread-sleep! 1) ;; give the flush one second to do it's stuff
-			     (debug:print 0 "       Done.")
-			     (exit 4))
-			   "exit on ^C timer")))
-     (thread-start! th2)
-     (thread-start! th1)
-     (thread-join! th2))))
-
-(define (server:client-launch)
-  (set-signal-handler! signal/int server:client-signal-handler)
-   (if (server:client-setup)
-       (debug:print-info 2 "connected as client")
-       (begin
-	 (debug:print 0 "ERROR: Failed to connect as client")
-	 (exit))))
-

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -888,17 +888,17 @@
 	      (exit 1)))
 	(if (args:get-arg "-server")
 	    (open-run-close server:start db (args:get-arg "-server")))
  	    ;; (if (not (or (args:get-arg "-runall")     ;; runall and runtests are allowed to be servers
  	    ;;     	 (args:get-arg "-runtests")))
-	    ;;     (server:client-setup) ;; This is a duplicate startup!!!??? BUG?
+	    ;;     (client:setup) ;; This is a duplicate startup!!!??? BUG?
 	    ;;     ))
 	(set! keys (open-run-close db:get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
 	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
-		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
+		   (runconfig  (read-config runconfigf #f #t environ-patt: #f))) 
 	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
 		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
 		  (begin
 		    (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf)
 		    (if db (sqlite3:finalize! db))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -8,20 +8,18 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest zmq)
-(import (prefix sqlite3 sqlite3:))
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest zmq)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (declare (unit server))
 
 (declare (uses common))
 (declare (uses db))
-(declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses http-transport))
 (declare (uses zmq-transport))
 
 (include "common_records.scm")
@@ -136,70 +134,10 @@
        (send-message pub-socket (db:obj->string (vector success/fail query-sig result)))))
     (else 
      (debug:print 0 "ERROR: unrecognised transport type: " *transport-type*)
      result)))
 
-;;======================================================================
-;; C L I E N T S
-;;======================================================================
-
-(define (server:get-client-signature)
-  (if *my-client-signature* *my-client-signature*
-      (let ((sig (server:mk-signature)))
-	(set! *my-client-signature* sig)
-	*my-client-signature*)))
-
-(define (server:client-login serverdat)
-  (cdb:login serverdat *toppath* (server:get-client-signature)))
-
-;; Not currently used! But, I think it *should* be used!!!
-(define (server:client-logout serverdat)
-  (let ((ok (and (socket? serverdat)
-		 (cdb:logout serverdat *toppath* (server:get-client-signature)))))
-    ok))
-
-;; Do all the connection work, look up the transport type and set up the
-;; connection if required.
-;;
-;; There are two scenarios. 
-;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
-;;   2. We are a run tests, list runs or other interactive process and we mush figure out
-;;      *transport-type* and *runremote* from the monitor.db
-;;
-(define (server:client-setup #!key (numtries 50))
-  (if (not *toppath*)
-      (if (not (setup-for-run))
-	  (begin
-	    (debug:print 0 "ERROR: failed to find megatest.config, exiting")
-	    (exit))))
-  (debug:print-info 11 "*transport-type* is " *transport-type* ", *runremote* is " *runremote*)
-  (let* ((hostinfo  (if (not *transport-type*) ;; If we dont' already have transport type set then figure it out
-			(open-run-close tasks:get-best-server tasks:open-db)
-			#f)))
-    ;; if have hostinfo then extract the transport type 
-    ;; else fall back to fs
-    (debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo)
-    (set! *transport-type* (if hostinfo 
-    			       (string->symbol (tasks:hostinfo-get-transport hostinfo))
-			       'fs))
-    ;; ;; DEBUG STUFF
-    ;; (if (eq? *transport-type* 'fs)(begin (print "ERROR!!!!!!! refusing to run with transport " *transport-type*)(exit 99)))
-    
-    (debug:print-info 11 "Using transport type of " *transport-type* (if hostinfo (conc " to connect to " hostinfo) ""))
-    (case *transport-type* 
-      ((fs)(if (not *megatest-db*)(set! *megatest-db* (open-db))))
-      ((http)
-       (http-transport:client-connect (tasks:hostinfo-get-interface hostinfo)
-				      (tasks:hostinfo-get-port hostinfo)))
-      ((zmq)
-       (zmq-transport:client-connect (tasks:hostinfo-get-interface hostinfo)
-				     (tasks:hostinfo-get-port      hostinfo)
-				     (tasks:hostinfo-get-pubport   hostinfo)))
-      (else  ;; default to fs
-       (debug:print 0 "ERROR: unrecognised transport type " *transport-type* " attempting to continue with fs")
-       (set! *transport-type* 'fs)
-       (set! *megatest-db*    (open-db))))))
 
 
 ;; all routes though here end in exit ...
 (define (server:launch transport)
   (if (not *toppath*)
@@ -215,30 +153,5 @@
     ((zmq)  (zmq-transport:launch))
     (else
      (debug:print "WARNING: unrecognised transport " transport)
      (exit))))
 
-(define (server:client-signal-handler signum)
-  (handle-exceptions
-   exn
-   (debug:print " ... exiting ...")
-   (let ((th1 (make-thread (lambda ()
-			     "") ;; do nothing for now (was flush out last call if applicable)
-			   "eat response"))
-	 (th2 (make-thread (lambda ()
-			     (debug:print 0 "ERROR: Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
-			     (thread-sleep! 1) ;; give the flush one second to do it's stuff
-			     (debug:print 0 "       Done.")
-			     (exit 4))
-			   "exit on ^C timer")))
-     (thread-start! th2)
-     (thread-start! th1)
-     (thread-join! th2))))
-
-(define (server:client-launch)
-  (set-signal-handler! signal/int server:client-signal-handler)
-   (if (server:client-setup)
-       (debug:print-info 2 "connected as client")
-       (begin
-	 (debug:print 0 "ERROR: Failed to connect as client")
-	 (exit))))
-

Index: zmq-transport.scm
==================================================================
--- zmq-transport.scm
+++ zmq-transport.scm
@@ -285,15 +285,15 @@
 
 (define (zmq-transport:client-connect iface pullport pubport)
   (let* ((push-socket (zmq-transport:client-socket-connect iface pullport type: 'push))
 	 (sub-socket  (zmq-transport:client-socket-connect iface pubport
 						    type: 'sub
-						    subscriptions: (list (server:get-client-signature) "all")))
+						    subscriptions: (list (client:get-signature) "all")))
 	 (zmq-sockets (vector push-socket sub-socket))
 	 (login-res   #f))
     (debug:print-info 11 "zmq-transport:client-connect started. Next is login")
-    (set! login-res (server:client-login zmq-sockets))
+    (set! login-res (client:login serverdat zmq-sockets))
     (if (and (not (null? login-res))
 	     (car login-res))
 	(begin
 	  (debug:print-info 2 "Logged in and connected to " iface ":" pullport "/" pubport ".")
 	  (set! *runremote* zmq-sockets)