Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -30,11 +30,12 @@
    ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm subrun.scm \
    portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm 
 
 # module source files
-MSRCFILES = ftail.scm
+MSRCFILES = ftail.scm rmtmod.scm commonmod.scm
+
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
 dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
 json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
@@ -71,11 +72,11 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o
+mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
@@ -83,12 +84,12 @@
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
-mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm
-	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
 
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
@@ -108,11 +109,13 @@
 	megatest-version.o \
 	ods.o \
 	portlogger.o \
 	process.o \
 	rmt.o \
-	rpc-transport.o \
+        mofiles/rmtmod.o \
+        mofiles/commonmod.o \
+        rpc-transport.o \
 	runconfig.o \
 	runs.o \
 	server.o \
 	tasks.o \
 	tdb.o \
@@ -160,10 +163,13 @@
 vg.o dashboard.o : vg_records.scm
 dcommon.o : run_records.scm
 # Temporary while transitioning to new routine
 # runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
 
+# for the modularized stuff
+mofiles/rmtmod.o : mofiles/commonmod.o
+
 megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
 	echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new
 	if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi
 
 $(OFILES) $(GOFILES) : common_records.scm 
@@ -196,12 +202,12 @@
 	utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil
 	chmod a+x $(PREFIX)/bin/mtutil
 
 # mtexec
 
-mtexec: $(OFILES) megatest-fossil-hash.scm mtexec.scm
-	csc $(CSCOPTS) $(OFILES) mtexec.scm -o mtexec
+mtexec: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtexec.scm
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtexec.scm -o mtexec
 
 $(PREFIX)/bin/.$(ARCHSTR)/mtexec : mtexec
 	$(INSTALL) mtexec $(PREFIX)/bin/.$(ARCHSTR)/mtexec
 
 $(PREFIX)/bin/mtexec : $(PREFIX)/bin/.$(ARCHSTR)/mtexec utils/mk_wrapper
@@ -320,11 +326,12 @@
 
 $(MTQA_FOSSIL) :
 	fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL)
 
 clean : 
-	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut tcmt ftail.import.scm readline-fix.scm serialize-env share dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
+	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut tcmt ftail.import.scm readline-fix.scm serialize-env dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
+	rm -rf share
 
 #======================================================================
 # Make the records files
 #======================================================================
 

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -78,11 +78,11 @@
     read-test-data*
     login
     tasks-get-last
     testmeta-get-record
     have-incompletes?
-    synchash-get
+    ;; synchash-get
     get-changed-record-ids
 		get-run-record-ids 
     get-not-completed-cnt))
 
 (define api:write-queries
@@ -247,11 +247,11 @@
 		 
                    ;; ARCHIVES
                    ;; ((archive-get-allocations)   
                    ((archive-register-disk)     (apply db:archive-register-disk dbstruct params))
                    ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params))
-                   ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
+                   ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
 
                    ;;======================================================================
                    ;; READ ONLY QUERIES
                    ;;======================================================================
 
@@ -271,21 +271,21 @@
                    ((test-get-rundir-from-test-id)    (apply db:test-get-rundir-from-test-id dbstruct params))
                    ((get-count-tests-running-for-testname) (apply db:get-count-tests-running-for-testname dbstruct params))
                    ((get-count-tests-running)         (apply db:get-count-tests-running dbstruct params))
                    ((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params))
                    ;; ((delete-test-step-records)        (apply db:delete-test-step-records dbstruct params))
-                   ((get-previous-test-run-record)    (apply db:get-previous-test-run-record dbstruct params))
+                   ;; ((get-previous-test-run-record)    (apply db:get-previous-test-run-record dbstruct params))
                    ((get-matching-previous-test-run-records)(apply db:get-matching-previous-test-run-records dbstruct params))
                    ((test-get-logfile-info)           (apply db:test-get-logfile-info dbstruct params))
                    ((test-get-records-for-index-file)  (apply db:test-get-records-for-index-file dbstruct params))
                    ((get-testinfo-state-status)       (apply db:get-testinfo-state-status dbstruct params))
                    ((test-get-top-process-pid)        (apply db:test-get-top-process-pid dbstruct params))
                    ((test-get-paths-matching-keynames-target-new) (apply db:test-get-paths-matching-keynames-target-new dbstruct params))
                    ((get-prereqs-not-met)             (apply db:get-prereqs-not-met dbstruct params))
                    ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id dbstruct params))
                    ((get-not-completed-cnt)           (apply db:get-not-completed-cnt  dbstruct params)) 
-                   ((synchash-get)                    (apply synchash:server-get dbstruct params))
+                   ;; ((synchash-get)                    (apply synchash:server-get dbstruct params))
                    ((get-raw-run-stats)               (apply db:get-raw-run-stats dbstruct params))
 		   ((get-test-times)                  (apply db:get-test-times dbstruct params))
 
                    ;; RUNS
                    ((get-run-info)                 (apply db:get-run-info dbstruct params))
@@ -294,11 +294,11 @@
                    ((set-run-status)               (apply db:set-run-status dbstruct params))
                    ((set-run-state-status)  			 (apply db:set-run-state-status dbstruct params))
                    ((get-tests-for-run)            (apply db:get-tests-for-run dbstruct params))
                    ((get-test-id)                  (apply db:get-test-id dbstruct params))
                    ((get-tests-for-run-mindata)    (apply db:get-tests-for-run-mindata dbstruct params))
-                   ((get-tests-for-runs-mindata)   (apply db:get-tests-for-runs-mindata dbstruct params))
+                   ;; ((get-tests-for-runs-mindata)   (apply db:get-tests-for-runs-mindata dbstruct params))
                    ((get-runs)                     (apply db:get-runs dbstruct params))
                    ((simple-get-runs)              (apply db:simple-get-runs dbstruct params))
                    ((get-num-runs)                 (apply db:get-num-runs dbstruct params))
                    ((get-runs-cnt-by-patt)         (apply db:get-runs-cnt-by-patt dbstruct params))
                    ((get-all-run-ids)              (db:get-all-run-ids dbstruct))
@@ -329,12 +329,12 @@
                                                          (run-id     (cadr params))
                                                          (realparams (cddr params)))
                                                      (db:general-call dbstruct stmtname realparams)))
                    ((sdb-qry)                      (apply sdb:qry params))
                    ((ping)                         (current-process-id))
-		   						 ((get-changed-record-ids)       (apply db:get-changed-record-ids dbstruct params))
-		   						 ((get-run-record-ids) 					 (apply db:get-run-record-ids dbstruct params))	
+		   ((get-changed-record-ids)       (apply db:get-changed-record-ids dbstruct params))
+		   ((get-run-record-ids) 	   (apply db:get-run-record-ids dbstruct params))	
                    ;; TESTMETA
                    ((testmeta-get-record)       (apply db:testmeta-get-record dbstruct params))
 
                    ;; TASKS 
                    ((find-task-queue-records)   (apply tasks:find-task-queue-records dbstruct params))

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -39,24 +39,26 @@
       (let ((sig (conc (get-host-name) " " (current-process-id))))
 	(set! *my-client-signature* sig)
 	*my-client-signature*)))
 
 ;; Not currently used! But, I think it *should* be used!!!
-(define (client:logout serverdat)
+#;(define (client:logout serverdat)
   (let ((ok (and (socket? serverdat)
 		 (cdb:logout serverdat *toppath* (client:get-signature)))))
     ok))
 
-(define (client:connect iface port)
-  (case (server:get-transport)
+#;(define (client:connect iface port)
+  (http-transport:client-connect iface port)
+  #;(case (server:get-transport)
     ((rpc)  (rpc:client-connect  iface port))
     ((http) (http:client-connect iface port))
     ((zmq)  (zmq:client-connect  iface port))
     (else   (rpc:client-connect  iface port))))
 
 (define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
-  (case (server:get-transport)
+  (client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)
+  #;(case (server:get-transport)
     ((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
     ((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects))
     (else  (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
 
 ;; Do all the connection work, look up the transport type and set up the

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -26,10 +26,12 @@
      (prefix sqlite3 sqlite3:)
      pkts (prefix dbi dbi:)
      )
 
 (declare (unit common))
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 
 
 ;; (require-library margs)
@@ -471,46 +473,92 @@
 ;;                     remove previous compressed log and compress this log
 ;; WARNING: This proc operates assuming that it is in the directory above the
 ;;          logs directory you wish to log-rotate.
 ;;
 (define (common:rotate-logs)
-  (if (not (directory-exists? "logs"))(create-directory "logs"))
-  (directory-fold 
-   (lambda (file rem)
-     (handle-exceptions
-      exn
-      (debug:print-info 0 *default-log-port* "unable to rotate log " file ", probably handled by another process.")
-      (let* ((fullname (conc "logs/" file))
-             (file-age (- (current-seconds)(file-modification-time fullname))))
-        (if (or (and (string-match "^.*.log" file)
-                     (> (file-size fullname) 200000))
-                (and (string-match "^server-.*.log" file)
-                     (> (- (current-seconds) (file-modification-time fullname))
-                        (* 8 60 60))))
-            (let ((gzfile (conc fullname ".gz")))
-              (if (common:file-exists? gzfile)
-                  (begin
-                    (debug:print-info 0 *default-log-port* "removing " gzfile)
-                    (delete-file gzfile)))
-              (debug:print-info 0 *default-log-port* "compressing " file)
-              (system (conc "gzip " fullname)))
-            (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
-                (handle-exceptions
-                 exn
-                 #f
-                 (delete-file fullname)))))))
-   '()
-   "logs"))
-
+  (let* ((all-files (make-hash-table))
+	 (stats     (make-hash-table))
+	 (inc-stat  (lambda (key)
+		      (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1))))
+	(max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age
+    (if (not (directory-exists? "logs"))(create-directory "logs"))
+    (directory-fold 
+     (lambda (file rem)
+       (handle-exceptions
+	exn
+	(begin
+	  (debug:print-info 0 *default-log-port* "unable to rotate log " file ", probably handled by another process.")
+	  (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+	  (print-call-chain (current-error-port)))
+	(let* ((fullname  (conc "logs/" file))
+	       (mod-time  (file-modification-time fullname))
+	       (file-age  (- (current-seconds) mod-time)))
+	  (hash-table-set! all-files file mod-time)
+	  (if (or (and (string-match "^.*.log" file)
+		       (> (file-size fullname) 200000))
+		  (and (string-match "^server-.*.log" file)
+		       (> (- (current-seconds) (file-modification-time fullname))
+			  (* 8 60 60))))
+	      (let ((gzfile (conc fullname ".gz")))
+		(if (common:file-exists? gzfile)
+		    (begin
+		      (debug:print-info 0 *default-log-port* "removing " gzfile)
+		      (delete-file* gzfile)
+		      (hash-table-delete!  all-files gzfile) ;; needed?
+		      ))
+		(debug:print-info 0 *default-log-port* "compressing " file)
+		(system (conc "gzip " fullname))
+		(inc-stat "gzipped")
+		(hash-table-set! all-files (conc file ".gz") file-age)  ;; add the .gz file and remove the base file
+		(hash-table-delete! all-files file)
+		)
+	      (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+		  (handle-exceptions
+		   exn
+		   #f
+		   (if (directory? fullname)
+		       (begin
+			 (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+			 (inc-stat "directories"))
+		       (begin
+			 (delete-file* fullname)
+			 (inc-stat "deleted")))
+		   (hash-table-delete! all-files file)))))))
+     '()
+     "logs")
+    (for-each
+     (lambda (category)
+       (let ((quant (hash-table-ref/default stats category 0)))
+	 (if (> quant 0)
+	     (debug:print-info 0 *default-log-port* category " log files: " quant))))
+     `("deleted" "gzipped" "directories"))
+    (let ((num-logs (hash-table-size all-files)))
+      (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
+	  (let ((files (take (sort (hash-table-keys all-files)
+				   (lambda (a b)
+				     (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
+			     (- num-logs max-allowed))))
+	    (for-each
+	     (lambda (file)
+	       (let* ((fullname (conc "logs/" file)))
+		 (if (directory? fullname)
+		     (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+		     (handle-exceptions
+		      exn
+		      (debug:print-error 0 *default-log-port* "failed to remove " fullname)
+		      (delete-file* fullname)))))
+	     files)
+	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files."))))))
+  
 ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
 ;; Do NOT check if not on homehost!
 ;;
 (define (common:exit-on-version-changed)
   (if (common:on-homehost?)
       (if (common:api-changed?)
 	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
-                (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
+                (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
                 (read-only (not (file-write-access? dbfile)))
                 (dbstruct (db:setup #t)))
 	    (debug:print 0 *default-log-port*
 			 "WARNING: Version mismatch!\n"
 			 "   expected: " (common:version-signature) "\n"
@@ -841,11 +889,11 @@
       *db-cache-path*
       (if *toppath* ;; common:get-create-writeable-dir
 	  (handle-exceptions
 	      exn
 	      (begin
-		(debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir)
+		(debug:print-error 0 *default-log-port* "Couldn't create path to " *db-cache-path*)
 		(exit 1))
 	    (let ((dbpath (common:get-create-writeable-dir
 			   (list (conc "/tmp/" (current-user-name)
 				       "/megatest_localdb/"
 				       (common:get-testsuite-name) "/"
@@ -1169,21 +1217,27 @@
          ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f))
          (testpatt-key  (or (args:get-arg "-modepatt") (args:get-arg "--modepatt") "TESTPATT"))
          (args-testpatt (or (args:get-arg "-testpatt") (args:get-arg "-runtests") "%"))
          (rtestpatt     (if rconf (runconfigs-get rconf testpatt-key) #f)))
     (cond
-     ((args:get-arg "--modepatt") ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig
+     ((or (args:get-arg "--modepatt") (args:get-arg "-modepatt")) ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig
       (if rconf
-	  (runconfigs-get rconf testpatt-key)
-	  #f))     ;; We do NOT fall back to "%"
+	  (let* ((patts-from-mode-patt	  (runconfigs-get rconf testpatt-key)))
+	    (debug:print-info 0 *default-log-port* "modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key " "  patts-from-mode-patt)
+	    patts-from-mode-patt)
+	  (begin
+	    (debug:print-info 0 *default-log-port* " modepatt defined is: "testpatt-key" runconfigs values for  " testpatt-key) ;;  " " patts-from-mode-patt)
+	    #f)))     ;; We do NOT fall back to "%"
      ;; (tags-testpatt
      ;;  (debug:print-info 0 *default-log-port* "-tagexpr "tagexpr" selects testpatt "tags-testpatt)
      ;;  tags-testpatt)
      ((and (equal? args-testpatt "%") rtestpatt)
       (debug:print-info 0 *default-log-port* "testpatt defined in "testpatt-key" from runconfigs: " rtestpatt)
       rtestpatt)
-     (else args-testpatt))))
+     (else 
+      (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt)
+      args-testpatt))))
 
 
 
 (define (common:false-on-exception thunk #!key (message #f))
   (handle-exceptions exn
@@ -1978,15 +2032,15 @@
       (get-unix-df path)))
 
 (define (get-free-inodes path)
   (if (configf:lookup *configdat* "setup" "free-inodes-script")
       (with-input-from-pipe 
-       (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
-       (lambda ()
-	 (let ((res (read-line)))
-	   (if (string? res)
-	       (string->number res)))))
+	  (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
+	(lambda ()
+	  (let ((res (read-line)))
+	    (if (string? res)
+		(string->number res)))))
       (get-unix-inodes path)))
 
 (define (get-unix-df path)
   (let* ((df-results (process:cmd-run->list (conc "df " path)))
 	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
@@ -2002,11 +2056,11 @@
     freespc))
 
 (define (get-unix-inodes path)
   (let* ((df-results (process:cmd-run->list (conc "df -i " path)))
 	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
-	 (freenodes    #f))
+	 (freenodes    0)) ;; 0 is a better failsafe than #f here.
     ;; (write df-results)
     (for-each (lambda (l)
 		(let ((match (string-search space-rx l)))
 		  (if match 
 		      (let ((newval (string->number (cadr match))))
@@ -2877,12 +2931,10 @@
 		  (queue-push cmddat) 		;; put request into the queue
 		  (nn-send soc "queued"))         ;; reply with "queued"
 		(print "ERROR: ["(common:human-time)"] BAD request " dat))
 	    (loop (nn-recv soc)))))
     (nn-close soc)))
-  
-
 
 ;;======================================================================
 ;; D A S H B O A R D   U S E R   V I E W S
 ;;======================================================================
 

ADDED   commonmod.scm
Index: commonmod.scm
==================================================================
--- /dev/null
+++ commonmod.scm
@@ -0,0 +1,36 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit commonmod))
+
+(module commonmod
+	*
+	
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+
+;; (define (debug:print . params) #f)
+;; (define (debug:print-info . params) #f)
+;; 
+;; (define (set-functions dbgp dbgpinfo)
+;;   (set! debug:print dbgp)
+;;   (set! debug:print-info dbgpinfo))
+
+)

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -121,11 +121,11 @@
 						    "             extra)))"))
 				((get g)   
 				 (let* ((parts (string-split cmd))
 					(sect  (car parts))
 					(var   (cadr parts)))
-				   (conc "(lambda (ht)(config-lookup ht \"" sect "\" \"" var "\"))")))
+				   (conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))")))
 				((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
 				;; ((rget)           (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
 				(else "(lambda (ht)(print \"ERROR\") \"ERROR\")"))))
 		;; (print "fullcmd=" fullcmd)
 		(handle-exceptions
@@ -463,11 +463,11 @@
 	       ;; if a continued line
 	       (configf:cont-ln-rx ( x whsp val     )
                                    (let ((alist (hash-table-ref/default res curr-section-name '())))
                                      (if var-flag             ;; if set to a string then we have a continued var
                                          (let ((newval (conc 
-                                                        (config-lookup res curr-section-name var-flag) "\n"
+                                                        (configf:lookup res curr-section-name var-flag) "\n"
                                                         ;; trim lead from the incoming whsp to support some indenting.
                                                         (if lead
                                                             (string-substitute (regexp lead) "" whsp)
                                                             "")
                                                         val)))
@@ -498,11 +498,11 @@
     (let ((configdat  (if configfile 
 			  (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f))))
       (if toppath (change-directory curr-dir))
       (list configdat toppath configfile fname))))
 
-(define (config-lookup cfgdat section var)
+(define (configf:lookup cfgdat section var)
   (if (hash-table? cfgdat)
       (let ((sectdat (hash-table-ref/default cfgdat section '())))
 	(if (null? sectdat)
 	    #f
 	    (let ((match (assoc var sectdat)))
@@ -519,11 +519,11 @@
 ;;  (configf:var-is? cfgdat "foo" "var" "yes") => #t
 ;;
 (define (configf:var-is? cfgdat section var expected-val)
   (equal? (configf:lookup cfgdat section var) expected-val))
 
-(define configf:lookup config-lookup)
+(define config-lookup configf:lookup)
 (define configf:read-file read-config)
 
 ;; safely look up a value that is expected to be a number, return
 ;; a default (#f unless provided)
 ;;
@@ -634,11 +634,11 @@
 	 (sechash (make-hash-table)) ;; current section hash, init with hash for "default" section
 	 (new     #f) ;; put the line to be used in new, if it is to be deleted the set new to #f
 	 (secname #f))
 
     ;; step 2: Flatten multiline entries
-    (if (not (null? fdat))(set! fdat (configf:compress-multi-line fdat)))
+    (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat)))
 
     ;; step 3: Modify values per contents of "indat" and remove absent values
     (if (not (null? fdat))
 	(let loop ((hed  (car fdat))
 		   (tal  (cadr fdat))
@@ -649,19 +649,19 @@
 	   (configf:comment-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
 	   (configf:blank-l-rx _                  (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
 	   (configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f)))
 					    (if (not section-hash)
 						(let ((newhash (make-hash-table)))
-						  (hash-table-set! refhash section-name newhash)
+						  (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here
 						  (set! sechash newhash))
 						(set! sechash section-hash))
 					    (set! new hed) ;; will append this at the bottom of the loop
 					    (set! secname section-name)
 					    ))
 	   ;; No need to process key cmd, let it fall though to key val
 	   (configf:key-val-pr ( x key val      )
-		       (let ((newval (config-lookup indat sec key)))
+		       (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct?
 			 ;; can handle newval == #f here => that means key is removed
 			 (cond 
 			  ((equal? newval val)
 			   (set! res (append res (list hed))))
 			  ((not newval) ;; key has been removed
@@ -683,18 +683,18 @@
      (lambda (section)
        (let ((sdat   '()) ;; append needed bits here
 	     (svars  (configf:section-vars indat section)))
 	 (for-each 
 	  (lambda (var)
-	    (let ((val (config-lookup refdat section var)))
+	    (let ((val (configf:lookup refdat section var)))
 	      (if (not val) ;; this one is new
 		  (begin
 		    (if (null? sdat)(set! sdat (list (conc "[" section "]"))))
 		    (set! sdat (append sdat (list (conc var " " val))))))))
 	  svars)
 	 (set! fdat (append fdat sdat))))
-     (delete-duplicates (append require-sections (hash-table-keys indat))))
+     (delete-duplicates (append required-sections (hash-table-keys indat))))
 
     ;; step 5: Write out new file
     (with-output-to-file fname 
       (lambda ()
 	(for-each 

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -49,10 +49,16 @@
 ;; C O M M O N
 ;;======================================================================
 
 (define *dashboard-comment-share-slot* #f)
 
+(define (message-window msg)
+  (iup:show
+   (iup:dialog
+    (iup:vbox 
+     (iup:label msg #:margin "40x40")))))
+
 (define (dtests:get-pre-command #!key (default-override #f))
   (let* ((orig-pre-command "export CMD='")
          (viewscreen-pre-command  "viewscreen ")
          (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen"))
          (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command))
@@ -628,11 +634,11 @@
 				  #:expand "HORIZONTAL"
 				  #:font "Courier New, -10"
 				  #:action (lambda (obj cnum val)
 					     ;; (print "cnum=" cnum)
 					     (if (eq? cnum 13)
-						 (command-prox obj)))
+						 (command-proc obj)))
 				  ))
 	       (command-launch-button (iup:button "Execute!" #:action (lambda (x)
 									(command-proc command-text-box))))
 	;; (lambda (x)
 	;; 								(let* ((cmd     (iup:attribute command-text-box "VALUE"))
@@ -823,6 +829,112 @@
 				 ;; Now start keeping the gui updated from the db
 				 (refreshdat) ;; update from the db here
 					;(thread-suspend! other-thread)
 				 (if *exit-started*
 				     (set! *exit-started* 'ok))))))))))
+
+(define (colors-similar? color1 color2)
+  (let* ((c1    (map string->number (string-split color1)))
+	 (c2    (map string->number (string-split color2)))
+	 (delta (map (lambda (a b)(abs (- a b))) c1 c2)))
+    (null? (filter (lambda (x)(> x 3)) delta))))
+
+;; Display the tests as rows of boxes on the test/task pane
+;;
+(define (dashboard:draw-tests cnv xadj yadj tests-draw-state sorted-testnames test-records)
+  (canvas-clear! cnv)
+  (canvas-font-set! cnv "Helvetica, -10")
+  (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv))
+	       ((originx originy)             (canvas-origin cnv)))
+    ;; (print "originx: " originx " originy: " originy)
+    ;; (canvas-origin-set! cnv 0 (- (/ sizey 2)))
+    (if (hash-table-ref/default tests-draw-state 'first-time #t)
+	(begin
+	  (hash-table-set! tests-draw-state 'first-time #f)
+	  (hash-table-set! tests-draw-state 'scalef 1)
+	  (hash-table-set! tests-draw-state 'tests-info (make-hash-table))
+	  (hash-table-set! tests-draw-state 'selected-tests (make-hash-table))
+	  ;; set these 
+	  (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
+	(dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
+    ))
+
+(define (dboard:tabdat-test-patts-use vec)    
+  (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for?
+
+;; additional setters for dboard:data
+(define (dboard:tabdat-test-patts-set!-use    vec val)
+  (dboard:tabdat-test-patts-set! vec (if (equal? val "") #f val)))
+
+;; Extract the various bits of data from tabdat and create the command line equivalent that will be displayed
+;;
+(define (dashboard:update-run-command tabdat)
+  (let* ((cmd-tb       (dboard:tabdat-command-tb tabdat))
+	 (cmd          (dboard:tabdat-command    tabdat))
+	 (test-patt    (let ((tp (dboard:tabdat-test-patts tabdat)))
+			 (if (or (not tp)
+                                 (equal? tp ""))
+                             "%"
+                             tp)))
+	 (states       (dboard:tabdat-states     tabdat))
+	 (statuses     (dboard:tabdat-statuses   tabdat))
+	 (target       (let ((targ-list (dboard:tabdat-target     tabdat)))
+			 (if targ-list (string-intersperse targ-list "/") "no-target-selected")))
+	 (run-name     (dboard:tabdat-run-name   tabdat))
+	 (states-str   (if (or (not states)
+			       (null? states))
+			   ""
+			   (conc " -state "  (string-intersperse states ","))))
+	 (statuses-str (if (or (not statuses)
+			       (null? statuses))
+			   ""
+			   (conc " -status " (string-intersperse statuses ","))))
+	 (full-cmd  "megatest"))
+    (case (string->symbol cmd)
+      ((run)
+       (set! full-cmd (conc full-cmd 
+			    " -run"
+			    " -testpatt "
+			    test-patt
+			    " -target "
+			    target
+			    " -runname "
+			    run-name
+			    " -clean-cache"
+			    )))
+      ((remove-runs)
+       (set! full-cmd (conc full-cmd
+			    " -remove-runs -runname "
+			    run-name
+			    " -target " 
+			    target
+			    " -testpatt "
+			    test-patt
+			    states-str
+			    statuses-str
+			    )))
+      (else (set! full-cmd " no valid command ")))
+    (iup:attribute-set! cmd-tb "VALUE" full-cmd)))
+
+(define (iuplistbox-fill-list lb items #!key (selected-item #f))
+  (let ((i 1))
+    (for-each (lambda (item)
+		(iup:attribute-set! lb (number->string i) item)
+		(if selected-item
+		    (if (equal? selected-item item)
+			(iup:attribute-set! lb "VALUE" i))) ;; (number->string i))))
+		(set! i (+ i 1)))
+	      items)
+    ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item ""))
+    i))
+
+;; if tab-num passed in then use it, otherwise look in commondat at curr-tab-num
+;; adds the updater passed in the updaters list at that hashkey
+;;
+(define (dboard:commondat-add-updater commondat updater #!key (tab-num #f))
+  (let* ((tnum          (or tab-num
+			     (dboard:commondat-curr-tab-num commondat)))
+	 (curr-updaters (hash-table-ref/default (dboard:commondat-updaters commondat) tnum '())))
+    (hash-table-set! (dboard:commondat-updaters commondat)
+		     tnum
+		     (cons updater curr-updaters))))
 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1,6 +1,6 @@
-;======================================================================
+;;======================================================================
 ;; Copyright 2006-2016, Matthew Welland.
 ;; 
 ;; This file is part of Megatest.
 ;; 
 ;;     Megatest is free software: you can redistribute it and/or modify
@@ -226,11 +226,11 @@
                 (readyfname  (conc parent-dir "/.ready-" raw-fname))
                 (readyexists (common:file-exists? readyfname)))
            (if (not readyexists)
                (common:simple-file-lock-and-wait lockfname))
            (let ((db      (sqlite3:open-database fname)))
-             (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
+             (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
              (sqlite3:execute db "PRAGMA synchronous = 0;")
              (if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname))
                  (begin
                    ;;(print "DEBUG: Setting tmp_mode for " fname) 
                    (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode"))
@@ -267,11 +267,13 @@
         
 	(condition-case
          (begin
            (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname)
            (let ((db (sqlite3:open-database fname)))
-             ;; (mutex-unlock! *db-open-mutex*)
+             (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+             (sqlite3:execute db "PRAGMA synchronous = 0;")
+	     ;; (mutex-unlock! *db-open-mutex*)
              db))
          (exn (io-error)  (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
          (exn (corrupt)   (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed."))
          (exn (busy)      (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back."))
          (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem."))
@@ -605,10 +607,12 @@
 		      "\"\n")
 	 (exit) ;; we can not safely continue when a db was corrupted - even if fixed.
 	 )
        ;; test read/write access to the database
        (let ((db (sqlite3:open-database dbpath)))
+	 (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+	 (sqlite3:execute db "PRAGMA synchronous = 0;")
 	 (cond
 	  ((equal? fname "megatest.db")
 	   (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED';"))
 	  ((equal? fname "main.db")
 	   (sqlite3:execute db "DELETE FROM runs WHERE state='deleted';"))
@@ -617,11 +621,11 @@
 	  ((equal? fname "monitor.db")
 	   (sqlite3:execute "DELETE FROM servers WHERE state LIKE 'defunct%';"))
 	  (else
 	   (sqlite3:execute db "vacuum;")))
 	 
-	 (finalize! db)
+	 (sqlite3:finalize! db)
 	 #t))))))
     
 ;; tbls is ( ("tablename" ( "field1" [#f|proc1] ) ( "field2" [#f|proc2] ) .... ) )
 ;; db's are dbdat's
 ;;
@@ -1109,11 +1113,11 @@
               (debug:print-info 0 *default-log-port* "Sync of " res " records from newdb to olddb completed in " sync-time " seconds pid="(current-process-id))
               (debug:print-info 0 *default-log-port* "No sync needed, last updated " (- start-time last-update) " seconds ago")))
       res))
 
 ;; keeping it around for debugging purposes only
-(define (open-run-close-no-exception-handling  proc idb . params)
+#;(define (open-run-close-no-exception-handling  proc idb . params)
   (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
   (print "I don't work anymore. open-run-close-no-exception-handling needs fixing or removing...")
   (exit)
   (if (or *db-write-access*
 	  (not #t)) ;; was: (member proc * db:all-write-procs *)))
@@ -1128,11 +1132,11 @@
 	(if (not idb)(sqlite3:finalize! dbstruct))
 	(debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling END" )
 	res)
       #f))
 
-(define (open-run-close-exception-handling proc idb . params)
+#;(define (open-run-close-exception-handling proc idb . params)
   (handle-exceptions
    exn
    (let ((sleep-time (random 30))
 	 (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
      (case err-status
@@ -1148,11 +1152,11 @@
 	(debug:print-info 0 *default-log-port* "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up")))
      (apply open-run-close-exception-handling proc idb params))
    (apply open-run-close-no-exception-handling proc idb params)))
 
 ;; (define open-run-close 
-(define open-run-close open-run-close-exception-handling)
+#;(define open-run-close open-run-close-exception-handling)
 		;;	   open-run-close-no-exception-handling
 ;;			   open-run-close-exception-handling)
 ;;)
 
 (define (db:initialize-main-db dbdat)
@@ -1461,11 +1465,11 @@
      db
      "SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;"
      bdisk-id archive-path)
     (if res ;; record exists, update du if applicable and return res
 	(begin
-	  (if du (sqlite3:exectute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
+	  (if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
                                           WHERE archive_disk_id=? AND disk_path=?;"
 				   bdisk-id archive-path du))
 	  res)
 	(begin
 	  (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du)
@@ -1518,11 +1522,11 @@
 
 (define (open-logging-db)
   (let* ((dbpath    (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname)
 	 (dbexists  (common:file-exists? dbpath))
 	 (db        (sqlite3:open-database dbpath))
-	 (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
+	 (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
 					   (string->number (args:get-arg "-override-timeout"))
 					   136000)))) ;; 136000)))
     (sqlite3:set-busy-handler! db handler)
     (if (not dbexists)
 	(begin
@@ -1934,11 +1938,11 @@
 (define (db:open-no-sync-db)
   (let* ((dbpath (db:dbfile-path))
 	 (dbname (conc dbpath "/no-sync.db"))
 	 (db-exists (common:file-exists? dbname))
 	 (db     (sqlite3:open-database dbname)))
-    (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
+    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
     (if (not db-exists)
 	(begin
 	  (sqlite3:execute db "PRAGMA synchronous = 0;")
 	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));")
 	  (sqlite3:execute db "PRAGMA journal_mode=WAL;")))
@@ -4109,17 +4113,18 @@
 ;;
 (define (db:get-state-status-summary dbstruct run-id testname)
   (let ((res   '()))
     (db:with-db
      dbstruct #f #f
-     (sqlite3:for-each-row
-      (lambda (state status count)
-	(set! res (cons (vector state status count) res)))
-      db
-      "SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
-      run-id testname)
-     res)))
+     (lambda (db)
+       (sqlite3:for-each-row
+	(lambda (state status count)
+	  (set! res (cons (vector state status count) res)))
+	db
+	"SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
+	run-id testname)
+       res))))
 
 (define (db:get-latest-host-load dbstruct raw-hostname)
   (let* ((hostname (string-substitute "\\..*$" "" raw-hostname))
          (res  (cons -1 0)))
     (db:with-db
@@ -4569,10 +4574,11 @@
 	      ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
                ((not ever-seen)
                 (set! result (append (if (null? waiton-tests)(list waitontest-name) waiton-tests) result))))))
 	  waitons)
 	 (delete-duplicates result)))))
+
 ;;======================================================================
 ;; To sync individual run
 ;;======================================================================
 (define (db:get-run-record-ids dbstruct target run keynames test-patt)
 (let ((backcons (lambda (lst item)(cons item lst))))
@@ -4587,15 +4593,15 @@
 		     " AND "))
          (run-qry (conc "SELECT id FROM runs  WHERE " keystr  " and runname='" run"'"))
          (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'")))
          (print run-qry)
          (print test-qry) 
-       `((runs       . ,(fold-row backcons '() db run-qry))
-	 			(tests      . ,(fold-row backcons '() db test-qry))
-	 			(test_steps . ,(fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")")))
-	 			(test_data  . ,(fold-row backcons '() db (conc "SELECT id FROM test_data  WHERE test_id in (" test-qry ")" )))
-	 ))))))
+	 `((runs       . ,(sqlite3:fold-row backcons '() db run-qry))
+	   (tests      . ,(sqlite3:fold-row backcons '() db test-qry))
+	   (test_steps . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")")))
+	   (test_data  . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_data  WHERE test_id in (" test-qry ")" )))
+	   ))))))
 
 ;;======================================================================
 ;; Just for sync, procedures to make sync easy
 ;;======================================================================
 
@@ -4606,16 +4612,16 @@
   ;; no transaction, allow the db to be accessed between the big queries
   (let ((backcons (lambda (lst item)(cons item lst))))
     (db:with-db
      dbstruct #f #f 
      (lambda (db)
-       `((runs       . ,(fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
-	 (tests      . ,(fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
-	 (test_steps . ,(fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
-	 (test_data  . ,(fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time))
+       `((runs       . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs  WHERE last_update>=?" since-time))
+	 (tests      . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
+	 (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
+	 (test_data  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_data  WHERE last_update>=?" since-time))
 	 ;; (test_meta  . ,(fold-row backcons '() db "SELECT id FROM test_meta  WHERE last_update>?" since-time))
-	 (run_stats  . ,(fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
+	 (run_stats  . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats  WHERE last_update>=?" since-time))
 	 )))))
 
 ;;======================================================================
 ;; Extract ods file from the db
 ;;======================================================================

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -43,10 +43,75 @@
 
 ;;======================================================================
 ;; C O M M O N   D A T A   S T R U C T U R E
 ;;======================================================================
 ;; 
+;; data common to all tabs goes here
+;;
+(defstruct dboard:commondat
+  ((curr-tab-num 0) : number)
+  please-update  
+  tabdats
+  update-mutex
+  updaters 
+  updating
+  uidat ;; needs to move to tabdat at some time
+  hide-not-hide-tabs
+  )
+
+(define (dboard:commondat-make)
+  (make-dboard:commondat
+   curr-tab-num:         0
+   tabdats:              (make-hash-table)
+   please-update:        #t
+   update-mutex:         (make-mutex)
+   updaters:             (make-hash-table)
+   updating:             #f
+   hide-not-hide-tabs:   #f
+   ))
+
+;; RADT => Matrix defstruct addition
+(defstruct dboard:graph-dat
+    ((id           #f) : string)
+    ((color        #f) : vector)
+    ((flag         #t) : boolean)
+    ((cell         #f) : number)
+    )
+
+;; data for runs, tests etc. was used in run summary?
+;;
+(defstruct dboard:runsdat
+  ;; new system
+  runs-index    ;; target/runname => colnum
+  tests-index   ;; testname/itempath => rownum
+  matrix-dat    ;; vector of vectors rows/cols
+  )
+
+(define (dboard:runsdat-make-init)
+  (make-dboard:runsdat
+   runs-index: (make-hash-table)
+   tests-index: (make-hash-table)
+   matrix-dat: (make-sparse-array)))
+
+;; used to keep the rundata from rmt:get-tests-for-run
+;; in sync. 
+;;
+(defstruct dboard:rundat
+  run
+  tests-drawn    ;; list of id's already drawn on screen
+  tests-notdrawn ;; list of id's NOT already drawn
+  rowsused       ;; hash of lists covering what areas used - replace with quadtree
+  hierdat        ;; put hierarchial sorted list here
+  tests          ;; hash of id => testdat
+  ((tests-by-name (make-hash-table)) : hash-table) ;; hash of testfullname => testdat
+  key-vals
+  ((last-update   0)                 : number)    ;; last query to db got records from before last-update
+  ((last-db-time  0)                 : number)    ;; last timestamp on megatest.db
+  ((data-changed  #f)                : boolean)   
+  ((run-data-offset  0)              : number)      ;; get only 100 items per call, set back to zero when received less than 100 items
+  (db-path #f))
+
 
 ;;======================================================================
 ;; D O T F I L E
 ;;======================================================================
 
@@ -81,11 +146,11 @@
 ;;
 (define (dcommon:modifiy-if-different mtrx cell-name new-val prev-changed)
   (let ((curr-val (iup:attribute mtrx cell-name)))
     (if (not (equal? curr-val new-val)) 
 	(begin
-	  (iup:attribute-set! mtrx cell-name col-name)
+	  (iup:attribute-set! mtrx cell-name new-val) ;; was col-name
 	  #t) ;; need a re-draw
 	prev-changed)))
 
 
 ;; TO-DO
@@ -270,11 +335,11 @@
 ;;     (if changed (iup:attribute-set! (dboard:tabdat-runs-matrix data) "REDRAW" "ALL"))
 ;;     ;; (debug:print 2 *default-log-port* "run-changes: " run-changes)
 ;;     ;; (debug:print 2 *default-log-port* "test-changes: " test-changes)
 ;;     (list run-changes all-test-changes)))
 
-(define (dcommon:runsdat-get-col-num dat target runname force-set)
+#;(define (dcommon:runsdat-get-col-num dat target runname force-set)
   (let* ((runs-index (dboard:runsdat-runs-index dat))
 	 (col-name   (conc target "/" runname))
 	 (res        (hash-table-ref/default runs-index col-name #f)))
     (if res
 	res
@@ -281,11 +346,11 @@
 	(if force-set
 	    (let ((max-col-num (+ 1 (common:max (cons-1 (hash-table-values runs-index))))))
 	      (hash-table-set! runs-index col-name max-col-num)
 	      max-col-num)))))
 
-(define (dcommon:runsdat-get-row-num dat testname itempath force-set)
+#;(define (dcommon:runsdat-get-row-num dat testname itempath force-set)
   (let* ((tests-index (dboard:runsdat-runs-index dat))
 	 (row-name    (conc testname "/" itempath))
 	 (res         (hash-table-ref/default runs-index row-name #f)))
     (if res
 	res
@@ -448,11 +513,11 @@
           (debug:print 2 "ERROR: No test data found for test " test-id ", exiting")
           (exit 1))
         (let*
             ((rundir        (if testdat 
                                 (db:test-get-rundir testdat)
-                                logfile))
+                                (current-directory))) ;; logfile))
              (testfullname  (if testdat (db:test-get-fullname testdat) "Gathering data ..."))
              (xterm      (lambda ()
                            (if (directory-exists? rundir)
                                (let* ((shell (if (get-environment-variable "SHELL") 
                                                  (conc "-e " (get-environment-variable "SHELL"))
@@ -722,11 +787,11 @@
    (iup:menu-item "Files" (iup:menu   ;; Note that you can use either #:action or action: for options
 			   (iup:menu-item "Open"  action: (lambda (obj)
 							    (let* ((area-name (iup:textbox #:expand "HORIZONTAL"))
 								   (fd        (iup:file-dialog #:dialogtype "DIR"))
 								   (top       (iup:show fd #:modal? "YES")))
-							      (iup:attribute-set! source-tb "VALUE"
+							      (iup:attribute-set! area-name "VALUE" ;; was source-tb, no idea what is correct
 										  (iup:attribute fd "VALUE"))
 							      (iup:destroy! fd))))
 			   ;; (lambda (obj)
 			   ;;  (iup:show (iup:file-dialog))
 			   ;;  (print "File->open " obj)))
@@ -1330,6 +1395,63 @@
 (define (dcommon:run-html-viewer lfilename)
   (let ((htmlviewercmd (configf:lookup *configdat* "setup" "htmlviewercmd")))
     (if htmlviewercmd
 	(system (conc "(" htmlviewercmd " " lfilename " ) &")) 
 	(iup:send-url lfilename))))
+
+(define (dashboard:monitor-changed? commondat tabdat)
+  (let* ((run-update-time (current-seconds))
+	 (monitor-db-path (dboard:tabdat-monitor-db-path tabdat))
+	 (monitor-modtime (if (and monitor-db-path (common:file-exists? monitor-db-path))
+			      (file-modification-time monitor-db-path)
+			      -1)))
+    (if (and (eq? (dboard:commondat-curr-tab-num commondat) 0)
+	     (or (> monitor-modtime *last-monitor-update-time*)
+		 (> (- run-update-time *last-monitor-update-time*) 5))) ;; update every 1/2 minute just in case
+	(begin
+	  (set! *last-monitor-update-time* run-update-time) ;; monitor-modtime)
+	  #t)
+	#f)))
+
+;; DOES NOT WORK RELIABLY WITH /tmp WAL mode files. Timestamps only change when the db
+;; is closed (I think). If db dir starts with /tmp always return true
+;;
+(define (dashboard:database-changed? commondat tabdat #!key (context-key 'default))
+  (let* ((run-update-time (current-seconds))
+	 (dbdir           (dboard:tabdat-dbdir tabdat))
+	 (modtime         (dashboard:get-youngest-run-db-mod-time dbdir))
+	 (recalc          (dashboard:recalc modtime 
+					    (dboard:commondat-please-update commondat) 
+					    (dboard:get-last-db-update tabdat context-key))))
+    ;; (dboard:tabdat-last-db-update tabdat))))
+    (if recalc 
+	(dboard:set-last-db-update! tabdat context-key run-update-time))
+    (dboard:commondat-please-update-set! commondat #f)
+    recalc))
+
+(define (dashboard:get-youngest-run-db-mod-time dbdir)
+  (handle-exceptions
+   exn
+   (begin
+     (debug:print 2 *default-log-port* "WARNING: error in accessing databases in get-youngest-run-db-mod-time: " ((condition-property-accessor 'exn 'message) exn) " db-dir="dbdir)
+     (current-seconds)) ;; something went wrong - just print an error and return current-seconds
+   (common:max (map (lambda (filen)
+		      (file-modification-time filen))
+		    (glob (conc dbdir "/*.db*"))))))
+
+(define (dboard:get-last-db-update tabdat context)
+  (hash-table-ref/default (dboard:tabdat-last-db-update tabdat) context 0))
+
+(define (dboard:set-last-db-update! tabdat context newtime)
+  (hash-table-set! (dboard:tabdat-last-db-update tabdat) context newtime))
+
+;; point inside line
+;;
+(define-inline (dashboard:px-between px lx1 lx2)
+  (and (< lx1 px)(> lx2 px)))
+
+(define (dashboard:recalc modtime please-update-buttons last-db-update-time)
+  (or please-update-buttons
+      (and ;; (> (current-milliseconds)(+ *last-recalc-ended-time* 150)) ;; can't use this - it needs to be tab specific
+	   (> modtime (- last-db-update-time 3)) ;; add three seconds of margin
+	   (> (current-seconds)(+ last-db-update-time 1)))))
 

Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1178,11 +1178,11 @@
 dependencies, waiton, itemmatch, itemwait <a href="megatest_manual.html#_requirements_section">test requirements</a>
 </p>
 </li>
 <li>
 <p>
-miscellaneous; mode toplevel, runtimelim, skip on file or on running, waiver propagation
+miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation
 </p>
 </li>
 </ul></div>
 </li>
 <li>
@@ -2232,10 +2232,26 @@
 <div class="listingblock">
 <div class="content monospaced">
 <pre>[skip]
 fileexists /path/to/a/file # skip if /path/to/a/file exists</pre>
 </div></div>
+</div>
+<div class="sect2">
+<h3 id="_skip_if_a_file_does_not_exist">Skip if a File Does not Exist</h3>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist</pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_skip_if_a_script_completes_with_0_status">Skip if a script completes with 0 status</h3>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[skip]
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status</pre>
+</div></div>
 </div>
 <div class="sect2">
 <h3 id="_skip_if_test_ran_more_recently_than_specified_time">Skip if test ran more recently than specified time</h3>
 <div class="listingblock">
 <div class="title">Skip if this test has been run in the past fifteen minutes and 15 seconds.</div>
@@ -2974,10 +2990,10 @@
 </div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Version 1.0<br>
-Last updated 2019-02-19 11:13:54 PST
+Last updated 2019-07-09 14:27:38 PDT
 </div>
 </div>
 </body>
 </html>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -571,10 +571,26 @@
 
 -----------------
 [skip]
 fileexists /path/to/a/file # skip if /path/to/a/file exists
 -----------------
+
+Skip if a File Does not Exist
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist
+-----------------
+
+Skip if a script completes with 0 status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status
+-----------------
 
 Skip if test ran more recently than specified time
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .Skip if this test has been run in the past fifteen minutes and 15 seconds.

Index: docs/manual/study_plan.txt
==================================================================
--- docs/manual/study_plan.txt
+++ docs/manual/study_plan.txt
@@ -54,11 +54,11 @@
 * environment variables (table 5)
 * tests/_testname_/testconfig link:megatest_manual.html#_the_testconfig_file[testconfig details]
 ** ezsteps and logpro section
 ** iteration (one test applied to many inputs), items, itemstable link:megatest_manual.html#_iteration[test iteration]
 ** dependencies, waiton, itemmatch, itemwait link:megatest_manual.html#_requirements_section[test requirements]
-** miscellaneous; mode toplevel, runtimelim, skip on file or on running, waiver propagation
+** miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation
 * megatest areas
 ** megatest.config
 ** runconfigs.config
 ** config language features; include, shell, system, scheme, rp|realpath, getenv, get, rget, scriptinc link:megatest.html#_config_file_helpers[config file helpers]
 

ADDED   docs/ulex-transition.fig
Index: docs/ulex-transition.fig
==================================================================
--- /dev/null
+++ docs/ulex-transition.fig
@@ -0,0 +1,39 @@
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 1 0 3450.000 7793.750 2475 8625 3450 9075 4425 8625
+	0 0 1.00 60.00 120.00
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 1 0 3450.000 7762.500 4725 8625 3375 9300 2175 8625
+	0 0 1.00 60.00 120.00
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1200 1425 3675 1425 3675 4800 1200 4800 1200 1425
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3825 1425 7425 1425 7425 4800 3825 4800 3825 1425
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 2325 4950 2325 7200
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+	 3150 8550 3150 7200 1650 7200 1650 8550 3150 8550
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+	 5700 8550 5700 7200 3975 7200 3975 8550 5700 8550
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4800 4875 4800 7125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4800 4875 2700 7125
+4 0 0 50 -1 0 12 0.0000 4 150 1185 1350 1725 runs and tests\001
+4 0 0 50 -1 0 12 0.0000 4 195 1065 1725 7650 megatest.db\001
+4 0 0 50 -1 0 12 0.0000 4 195 1140 4950 5775 config setting\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7575 1.db\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7830 2.db\001
+4 0 0 50 -1 0 12 0.0000 4 15 240 4125 8085 ....\001
+4 0 0 50 -1 0 12 0.0000 4 150 360 4875 5325 ulex\001
+4 0 0 50 -1 0 12 0.0000 4 150 690 1125 825 v1.6535\001
+4 0 0 50 -1 0 12 0.0000 4 195 2190 2400 9600 import/export steps script\001
+4 0 0 50 -1 0 12 0.0000 4 195 1590 3900 1725 steps and test data\001

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -68,15 +68,15 @@
 	(for-each-row
 	 (lambda (row)
 	   (let ((var  (car row))
 		 (val  (cadr row)))
 	     (hash-table-set! result var 
-			      (if (and (hash-table-ref/default results var #f)
+			      (if (and (hash-table-ref/default result var #f)
 				       (assoc var paths)) ;; this var is a path and there is a previous path
 				  (let ((sep (cadr (assoc var paths))))
-				    (env:merge-path-envvar sep (hash-table-ref results var) valb))
-				  valb)))))
+				    (env:merge-path-envvar sep (hash-table-ref result var) val))
+				  val)))))
 	(sql db "SELECT var,val FROM envvars WHERE context=?")
 	context))
      contexts)
     result))
 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -58,10 +58,13 @@
 ;;
 
 (define *db:process-queue-mutex* (make-mutex))
 
 (define (http-transport:run hostn)
+  ;; Configurations for server
+  (tcp-buffer-size 2048)
+  (max-connections 2048) 
   (debug:print 2 *default-log-port* "Attempting to start the server ...")
   (let* ((db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
 	 (hostname        (get-host-name))
 	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
 					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
@@ -306,11 +309,11 @@
 	     (if (vector-ref res 0) ;; this is the first flag or the second flag?
 		 res ;; this is the *inner* vector? seriously? why?
                  (if (debug:debug-mode 11)
                      (let ((call-chain (get-call-chain))) ;; note: this code also called in nmsg-transport - consider consolidating it
                        (print-call-chain (current-error-port))
-                       (debug:print-error 11 *default-log-port* "error above occured at server, res=" res " message: " ((condition-property-accessor 'exn 'message) exn))
+                       (debug:print-error 11 *default-log-port* "error above occured at server, res=" res) ;; " message: " ((condition-property-accessor 'exn 'message) exn))
                        (debug:print 11 *default-log-port* " server call chain:")
                        (pp (vector-ref res 1) (current-error-port))
                        (signal (vector-ref res 0)))
                      res))
 	     (signal (make-composite-condition
@@ -379,17 +382,18 @@
 (define (http-transport: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
   (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
-  (let* ((tmp-area          (common:get-db-tmp-area))
+  (let* ((sdat              #f)
+	 (tmp-area          (common:get-db-tmp-area))
 	 (started-file      (conc tmp-area "/.server-started"))
 	 (server-start-time (current-seconds))
 	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
-                        (let ((sdat #f))
+                        (begin ;; let ((sdat #f))
 			  (thread-sleep! 0.01)
 			  (debug:print-info 0 *default-log-port* "Waiting for server alive signature")
                           (mutex-lock! *heartbeat-mutex*)
                           (set! sdat *server-info*)
                           (mutex-unlock! *heartbeat-mutex*)
@@ -415,16 +419,16 @@
                                                          (T      . server)
                                                          (pid    . ,(current-process-id))
                                                          (ipaddr . ,(car sdat))
                                                          (port   . ,(cadr sdat))
                                                          (msg    . "Transport died?"))
-                                                 *configdat* #t)
+						       *configdat* #t)
 				      (exit))
 				    (loop start-time
 					  (equal? sdat last-sdat)
 					  sdat)))))))
-         (iface       (car server-info))
+	 (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
 	 (server-timeout (server:expiration-timeout))
 	 (server-going  #f)
 	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
@@ -654,11 +658,11 @@
 	  "<h2>Server Stats</h2>"
 	  (http-transport:stats-table) 
 	  "<hr>"
 	  (http-transport:runs linkpath)
 	  "<hr>"
-	  (http-transport:run-stats)
+	  ;; (http-transport:run-stats)
 	  "</body>"
 	  )))
 
 (define (http-transport:stats-table)
   (mutex-lock! *heartbeat-mutex*)
@@ -689,14 +693,14 @@
 	   (map (lambda (p)
 		  (conc "<a href=\"" p "\">" p "</a><br>"))
 		files))
 	 " ")))
 
-(define (http-transport:run-stats)
+#;(define (http-transport:run-stats)
   (let ((stats (open-run-close db:get-running-stats #f)))
     (conc "<table>"
 	  (string-intersperse
 	   (map (lambda (stat)
 		  (conc "<tr><td>" (car stat) "</td><td>" (cadr stat) "</td></tr>"))
 		stats)
 	   " ")
 	  "</table>")))

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -117,11 +117,11 @@
 		  #f)))
       res)))
             ;; Nope, not now, return null as of 6/6/2011
 		
 (define (items:check-valid-items class item)
-  (let ((valid-values (let ((s (config-lookup *configdat* "validvalues" class)))
+  (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class)))
 			(if s (string-split s) #f))))
     (if valid-values
 	(if (member item valid-values)
 	    item #f)
 	item)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -754,11 +754,15 @@
           ;;(bb-check-path msg: "launch:execute post block 42")
 	  (set-item-env-vars itemdat)
           ;;(bb-check-path msg: "launch:execute post block 43")
           (let ((blacklist (configf:lookup *configdat* "setup" "blacklistvars")))
             (if blacklist
-                (save-environment-as-files "megatest" ignorevars: (string-split blacklist))
+		(let ((vars (string-split blacklist)))
+		  (save-environment-as-files "megatest" ignorevars: vars)
+		  (for-each (lambda (var)
+			      (unsetenv var))
+			    vars))
                 (save-environment-as-files "megatest")))
           ;;(bb-check-path msg: "launch:execute post block 44")
 	  ;; open-run-close not needed for test-set-meta-info
 	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
 	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
@@ -1247,11 +1251,11 @@
                                    (cons 1 (conc *toppath* "/runs"))
                                    (loop (car tail) (cdr tail)))))))))))))) ;; the code creates the necessary directories if it does not exist and returns the path.
 
 
 (define (launch:test-copy test-src-path test-path)
-  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
+  (let* ((ovrcmd (let ((cmd (configf:lookup *configdat* "setup" "testcopycmd")))
 		   (if cmd
 		       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
 		       (string-substitute "TEST_TARG_PATH" test-path
 					  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
 		       #f)))
@@ -1300,11 +1304,11 @@
 	 (toptest-path (conc disk-path (if contour (conc "/" contour) "") "/" testtop-base))
 	 (test-path    (conc disk-path (if contour (conc "/" contour) "") "/" test-base))
 
 	 ;; ensure this exists first as links to subtests must be created there
 	 (linktree  (common:get-linktree))
-	 ;; WAS: (let ((rd (config-lookup *configdat* "setup" "linktree")))
+	 ;; WAS: (let ((rd (configf:lookup *configdat* "setup" "linktree")))
 	 ;;         (if rd rd (conc *toppath* "/runs"))))
 	 ;; which seems wrong ...
 
 	 (lnkbase   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname))
 	 (lnkpath   (conc lnkbase "/" testname))
@@ -1511,23 +1515,23 @@
            ;; for tconfig, why do we allow fallback to test-conf?
 	   (tconfig         (or (tests:get-testconfig test-name item-path tregistry #t force-create: #t)
 				(begin
                                   (debug:print 0 *default-log-port* "WARNING: falling back to pre-calculated testconfig. This is likely not desired.")
                                   test-conf))) ;; force re-read now that all vars are set
-	   (useshell        (let ((ush (config-lookup *configdat* "jobtools"     "useshell")))
+	   (useshell        (let ((ush (configf:lookup *configdat* "jobtools"     "useshell")))
 			      (if ush 
 				  (if (equal? ush "no") ;; must use "no" to NOT use shell
 				      #f
 				      ush)
 				  #t)))     ;; default is yes
-	   (runscript       (config-lookup tconfig   "setup"        "runscript"))
+	   (runscript       (configf:lookup tconfig   "setup"        "runscript"))
 	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big, just send a flag
 	   (subrun          (> (length (hash-table-ref/default tconfig "subrun"  '())) 0)) ;; send a flag to process a subrun
-	   ;; (diskspace       (config-lookup tconfig   "requirements" "diskspace"))
-	   ;; (memory          (config-lookup tconfig   "requirements" "memory"))
-	   ;; (hosts           (config-lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
-	   (remote-megatest (config-lookup *configdat* "setup" "executable"))
+	   ;; (diskspace       (configf:lookup tconfig   "requirements" "diskspace"))
+	   ;; (memory          (configf:lookup tconfig   "requirements" "memory"))
+	   ;; (hosts           (configf:lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
+	   (remote-megatest (configf:lookup *configdat* "setup" "executable"))
 	   (run-time-limit  (or (configf:lookup  tconfig   "requirements" "runtimelim")
 				(configf:lookup  *configdat* "setup" "runtimelim")))
 	   ;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to 
 	   ;;                allow running from dashboard. Extract the path
 	   ;;                from the called megatest and convert dashboard
@@ -1539,11 +1543,11 @@
 				    (case (string->symbol exe)
 				      ((dboard)    "../megatest")
 				      ((mtest)     "../megatest")
 				      ((dashboard) "megatest")
 				      (else exe)))))
-	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (config-lookup *configdat* "jobtools"     "launcher"))
+	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (configf:lookup *configdat* "jobtools"     "launcher"))
 	   (test-sig        (conc (common:get-testsuite-name) ":" test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
 	   (work-area       #f)
 	   (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
 	   (diskpath   #f)
 	   (cmdparms   #f)
@@ -1706,11 +1710,11 @@
   ;;    - it it's run directory correct for the test
   ;;    - is there a controlling mtest (maybe stuck)
   ;; 2. if recovery is needed watch pid
   ;;    - when it exits take the exit code and do the needful
   ;;
-  (let* ((pid (rmt:test-get-top-process-id run-id test-id))
+  (let* ((pid (rmt:test-get-top-process-pid run-id test-id))
 	 (psres (with-input-from-pipe
 		 (conc "ps -F -u " (current-user-name) " | grep -E '" pid " ' | grep -v 'grep -E " pid "'")
 		 (lambda ()
 		   (read-line))))
 	 (rundir (if (string? psres) ;; real process owned by user

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -18,6 +18,6 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6535)
+(define megatest-version 1.6538)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -612,12 +612,12 @@
 
 (debug:setup)
 
 (if (args:get-arg "-logging")(set! *logging* #t))
 
-(if (debug:debug-mode 3) ;; we are obviously debugging
-    (set! open-run-close open-run-close-no-exception-handling))
+;;(if (debug:debug-mode 3) ;; we are obviously debugging
+;;    (set! open-run-close open-run-close-no-exception-handling))
 
 (if (args:get-arg "-itempatt")
     (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
       (debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
       (hash-table-set! args:arg-hash "-testpatt" newval)

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -1336,28 +1336,93 @@
 	  (conc pktsdir "/" uuid ".pkt")
 	(lambda ()
 	  (print pkt)))
       (print "ERROR: cannot process commands without a pkts directory")))
 
+(define (check-if-modepatt-defined  pkta notification-hook pktfile)
+  (let* ((start-dir (alist-ref 'S pkta))
+	 (target (or (alist-ref 'R pkta) (alist-ref 't pkta)))
+	 (patt (alist-ref 'o pkta))
+	 (uuid    (alist-ref 'Z pkta))
+	 (cmd (conc "megatest -show-runconfig -target " target " -start-dir " start-dir))
+	 (res    (handle-exceptions
+		  exn
+		  #f
+		  (print "Running " cmd)
+		  (with-input-from-pipe cmd read-lines)))) 
+    (let loop ((hed (car res))
+	       (tail (cdr res)))
+      (if (string-contains hed patt)
+	  #t
+	  (if (null? tail)
+	      (begin
+		(if notification-hook
+		    (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg INVALID_MODEPATT")))
+		      (print "Running " notification-cmd)
+		      (system notification-cmd))) 
+		#f)
+	      (loop (car tail) (cdr tail)))))))
+
+(define (check-if-target-defined pkta notification-hook pktfile)
+  (let* ((start-dir (alist-ref 'S pkta))
+	 (target (alist-ref 'R pkta))
+	 (uuid    (alist-ref 'Z pkta))
+	 (cmd (conc "megatest -list-targets -start-dir " start-dir))
+	 (res    (handle-exceptions
+		  exn
+		  #f
+		  (print "Running " cmd)
+		  (with-input-from-pipe cmd read-lines)))) 
+    (if (member target res)  
+	#t 
+	(begin 
+	  (if notification-hook
+	      (let* ((notification-cmd (conc notification-hook " --pkt "  pktfile " --msg INVALID_TARGET")))
+		(print "Running " notification-cmd)
+		(system notification-cmd)))
+	  #f))))
+
+
+(define (validate-cmd cmd pkta notification-hook pktfile)
+  (let ((ret #t)) 
+    (if (string-contains cmd "-reqtarg") 
+	(if (check-if-target-defined pkta notification-hook pktfile)
+	    (begin
+	      (print "Target is valid")
+	      (if (string-contains cmd "-modepatt")
+		  (if (check-if-modepatt-defined pkta notification-hook pktfile)
+		      (print "Modepatt is valid")
+		      (set! ret #f))))
+	    (set! ret #f))
+	(if (string-contains cmd "-modepatt")
+	    (if (check-if-modepatt-defined pkta notification-hook pktfile)
+		(print "Modepatt is valid")
+		(set! ret #f)))) 
+    ret))
+
+   
 ;; collect all needed data and create run pkts for contours with changed inputs
 ;;
 (define (dispatch-commands mtconf toppath)
   ;; we are expecting a directory "logs", check and create it, create the log in /tmp if not able to create logs dir
   (let ((logdir
 	 (if (if (not (directory? "logs"))
 		 (handle-exceptions
-		     exn
-		     #f
-		   (create-directory "logs")
-		   #t)
+		  exn
+		  #f
+		  (create-directory "logs")
+		  #t)
 		 #t)
 	     "logs"
 	     "/tmp"))
 	(cpuload (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
 	(maxload (string->number (or (configf:lookup mtconf "setup" "maxload")
 				     (configf:lookup mtconf "jobtools" "maxload") ;; respect value used by Megatest calls
-				     "1.1"))))
+				     "1.1")))
+	(notification-hook (if (configf:lookup mtconf "setup" "notification-hook")
+			       (configf:lookup mtconf "setup" "notification-hook")
+			       #f)))
     (common:with-queue-db
      mtconf
      (lambda (pktsdirs pktsdir pdb)
        (let* ((rgconfdat (find-and-read-config (conc toppath "/runconfigs.config")))
 	      (rgconf    (car rgconfdat))
@@ -1373,39 +1438,65 @@
 		   (cmdline (pkt->cmdline pkta))
 		   (uuid    (alist-ref 'Z pkta))
 		   (user    (alist-ref 'U pkta))
 		   (area    (alist-ref 'G pkta))
 		   (logf    (conc logdir "/" uuid "-run.log"))
+		   (pktfile (conc pktsdir "/" uuid ".pkt"))
 		   (fullcmd (conc "NBFAKE_LOG=" logf " nbfake " cmdline)))
 	      (if (check-access user mtconf action area)
 		  (if (and (> cpuload maxload)
 			   (member action '("run" "archive"))) ;; do not run archive or run if load is over the specified limit
-		      (print "WARNING: cpuload too high, skipping processing of " uuid " due to " cpuload " > " maxload)
+		      (begin
+			(print "WARNING: cpuload too high, skipping processing of " uuid " due to " cpuload " > " maxload)
+			(if notification-hook
+			    (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg HIGH_LOAD")))
+			      (print "Running " notification-cmd) 
+			      (system notification-cmd))))
 		      (begin
-			(print "RUNNING: " fullcmd)
-			(system fullcmd) ;; replace with process ...
-			(mark-processed pdb (list (alist-ref 'id pktdat)))
-			(let-values (((ack-uuid ack-pkt)
-				      (add-z-card
-				       (construct-sdat 'P uuid
-						       'T (case (string->symbol action)
-							    ((run) "runstart")
-							    ((sync) "syncstart")    ;; example of translating run -> runstart
-							    (else   action))
-                                                       'G (alist-ref 'G pkta)
-						       'c (alist-ref 'c pkta) ;; THIS IS WRONG! SHOULD BE 'c
-						       't (alist-ref 't pkta)))))
-			  (write-pkt pktsdir ack-uuid ack-pkt))))
+			;; if modepatt used chek if it is defined for the target. If -reqtarg check if target exist.
+			(if (validate-cmd fullcmd pkta notification-hook pktfile)
+			    (begin
+			      (print "RUNNING: " fullcmd)
+			      (system fullcmd) ;; replace with process ...
+			      (mark-processed pdb (list (alist-ref 'id pktdat)))
+			      (let-values (((ack-uuid ack-pkt)
+					    (add-z-card
+					     (construct-sdat 'P uuid
+							     'T (case (string->symbol action)
+								  ((run) "runstart")
+								  ((sync) "syncstart")    ;; example of translating run -> runstart
+								  (else   action))
+							     'G (alist-ref 'G pkta)
+							     'c (alist-ref 'c pkta) ;; THIS IS WRONG! SHOULD BE 'c
+							     't (alist-ref 't pkta)))))
+				(write-pkt pktsdir ack-uuid ack-pkt))
+			      (if notification-hook
+				  (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg RUN_LAUNCHED --contour " (caar  contours) " --log_path " logf )))
+				    (print "Running " notification-cmd)				
+				    (system notification-cmd))))
+			    (begin
+			      (mark-processed pdb (list (alist-ref 'id pktdat)))
+			      (let-values (((ack-uuid ack-pkt)
+					    (add-z-card
+					     (construct-sdat 'P uuid
+							     'T "invalid-input"
+							     'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
+							     't (alist-ref 't pkta)))))
+				(write-pkt pktsdir ack-uuid ack-pkt))))))
 		  (begin ;; access denied! Mark as such
 		    (mark-processed pdb (list (alist-ref 'id pktdat)))
 		    (let-values (((ack-uuid ack-pkt)
 				  (add-z-card
 				   (construct-sdat 'P uuid
 						   'T "access-denied"
 						   'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
 						   't (alist-ref 't pkta)))))
-		      (write-pkt pktsdir ack-uuid ack-pkt))))))
+		      (write-pkt pktsdir ack-uuid ack-pkt))
+		    (if notification-hook
+			(let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg ACCESS_DENIED")))
+			  (print "Running " notification-cmd)
+			  (system notification-cmd)))))))
 	  pkts))))))
 
 
 (define (check-access user mtconf action area)
   ;; NOTE: Need control over defaults. E.g. default might be no access

ADDED   path-glob/path-glob.scm
Index: path-glob/path-glob.scm
==================================================================
--- /dev/null
+++ path-glob/path-glob.scm
@@ -0,0 +1,46 @@
+(define (multi-glob pathspec)
+  (let* ((path-parts (intersperse (string-split pathspec "/" #t) "/")))
+    (print "path-parts: " path-parts)
+    (if (null? path-parts)
+	'()
+	(let loop ((parts  (cdr path-parts))
+		   (result (let ((p (car path-parts)))
+			     (if (string=? p "")
+				 '("")
+				 (glob (car path-parts))))))
+	  (if (null? parts)
+	      result
+	      (let* ((part (car parts))
+		     (rem  (cdr parts)))
+		(loop rem
+		      (apply append
+			     (map (lambda (curr)
+				    (let ((new (string-append curr part)))
+				      (print "new: " new " part: " part)
+				      (cond
+				       ((and (directory? curr)(file-read-access? curr))
+					(glob new))
+				       ((member part '("." ".." "/")) (list new part))
+				       (else '()))))
+				  result)))))))))
+
+;; alternative implementation
+
+(define (path-glob pattern)
+  (let ((parts (string-split pattern "/" '())))
+    (if (null? parts)
+       '()
+       (glob-expand (car parts) (cdr parts))
+    )))
+
+(define (glob-expand pattern #!optional (rest '()))
+  (let ((result  '())
+	(expanded (glob pattern)))
+    (apply append result (cond
+			  ((null? expanded) (list '()))
+			  ((null? rest)     (list expanded))
+			  (else (map (lambda (x)
+				       (if (directory? x)
+					   (glob-expand (conc x "/" (car rest)) (cdr rest))
+					   '()))
+				     expanded))))))

ADDED   path-glob/test.scm
Index: path-glob/test.scm
==================================================================
--- /dev/null
+++ path-glob/test.scm
@@ -0,0 +1,46 @@
+(use test posix srfi-1)
+(load "path-glob.scm")
+
+;; (define globbers `((multi-glob . ,multi-glob)(path-glob . ,path-glob)))
+(define globbers `((path-glob . ,path-glob)))
+
+(define interesting-patts '("../*/*" "/*/bin/*" "./*/bin/*"))
+(define simple-patts '("../*" "/*" "/bin/*" "." ".." "*" "a[0-1]*"))
+
+(define (trim-list lst)
+  (if (> (length lst) 3)
+      (append (take lst 3) '(...))
+      lst))
+
+(define (generate-prefix patt)
+  (write (conc "patt: " patt (make-string (- 10 (string-length patt)) #\ ))))
+
+(print "\nCompare each globber with glob") ;; can only do one level globs here
+(for-each
+ (lambda (globber)
+   (print "\nGlobber: " globber " vs glob")
+   (for-each
+    (lambda (patt)
+      (generate-prefix patt)
+      (test #f '() (trim-list
+		    (lset-xor string=? ((alist-ref globber globbers) patt)(glob patt)))))
+    simple-patts))
+ (map car globbers))
+
+(print "\nTest the globbers against patts - only checks for resiliance, not correctness.")
+(for-each
+ (lambda (patt)
+   (generate-prefix patt)(test #f #t (list? (path-glob patt)))
+   ;; (generate-prefix patt)(test #f #t (list? (multi-glob patt)))
+   )
+ interesting-patts)
+
+(print "\nCompare the globbers against each other")
+#;(for-each
+ (lambda (patt)
+   (generate-prefix patt)
+   (test #f '() (trim-list
+		 (lset-xor string=? (path-glob patt)(multi-glob patt)))))
+ interesting-patts)
+
+(test-exit)

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -25,20 +25,19 @@
 (declare (unit portlogger))
 (declare (uses db))
 
 ;; lsof -i
 
-
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
 	 (exists   (common:file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
 			 (sqlite3:open-database fname))))
-	 (handler  (make-busy-timeout 136000))
+	 (handler  (sqlite3:make-busy-timeout 136000))
 	 (canwrite (file-write-access? fname)))
 	 ;; (db-init  (lambda ()
 	 ;;             (sqlite3:execute 
 	 ;;              db
 	 ;;              "CREATE TABLE IF NOT EXISTS ports (

Index: process.scm
==================================================================
--- process.scm
+++ process.scm
@@ -99,11 +99,11 @@
        (if (not (eof-object? curr))
 	   (loop (read-line fh)
 		 (append result (list (proc curr))))
 	   (begin
 	     (close-input-port fh)
-	     (close-input-port fhe)
+	     ;;(close-input-port fhe)
 	     (close-output-port fho)
 	     result))))))
 
 (define (process:cmd-run-proc-each-line-alt cmd proc)
   (let* ((fh (open-input-pipe cmd))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -22,10 +22,13 @@
 
 (declare (unit rmt))
 (declare (uses api))
 (declare (uses http-transport))
 (include "common_records.scm")
+(declare (uses rmtmod))
+
+(import rmtmod)
 
 ;;
 ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
 
@@ -77,21 +80,11 @@
   ;;
   (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
          (areapath      *toppath*);; TODO - resolve from dbstruct to be compatible with multiple areas
 	 (runremote     (or area-dat
 			    *runremote*))
-	 (readonly-mode (if (and runremote
-				 (remote-ro-mode-checked runremote))
-			    (remote-ro-mode runremote)
-			    (let* ((dbfile  (conc *toppath* "/megatest.db"))
-				   (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
-			      (if runremote
-				  (begin
-				    (remote-ro-mode-set! runremote ro-mode)
-				    (remote-ro-mode-checked-set! runremote #t)
-				    ro-mode)
-				  ro-mode)))))
+	 (readonly-mode (rmtmod:calc-ro-mode runremote *toppath*)))
 
     ;; DOT INIT_RUNREMOTE; // leaving off - doesn't really add to the clarity
     ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
     ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
     ;; ensure we have a record for our connection for given area
@@ -130,15 +123,11 @@
 
      ;;DOT CASE3 [label="write in\nread-only mode"];
      ;;DOT MUTEXLOCK -> CASE3 [label="readonly\nmode?"]; {rank=same "case 3" CASE3}
      ;;DOT CASE3 -> "#f";
      ;; readonly mode, write request.  Do nothing, return #f
-     (readonly-mode
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 3")
-      (debug:print 0 *default-log-port* "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-      #f)
+     (readonly-mode (extras-readonly-mode *rmt-mutex* *default-log-port* cmd params))
 
      ;; This block was for pre-emptively resetting the connection if there had been no communication for some time.
      ;; I don't think it adds any value. If the server is not there, just fail and start a new connection.
      ;; also, the expire-time calculation might not be correct. We want, time-since-last-server-access > (server:get-timeout)
      ;;
@@ -242,64 +231,54 @@
      ;;DOT CASE11 [label="send_receive"];
      ;;DOT MUTEXLOCK -> CASE11 [label="else"]; {rank=same "case 11" CASE11};
      ;;DOT CASE11 -> "rmt:send-receive" [label="call failed"];
      ;;DOT CASE11 -> "RESULT" [label="call succeeded"];
      ;; not on homehost, do server query
-     (else
-      ;; (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
-      ;; (mutex-lock! *rmt-mutex*)
-      (let* ((conninfo (remote-conndat runremote))
-	     (dat      (case (remote-transport runremote)
-			 ((http) (condition-case ;; handling here has caused a lot of problems. However it is needed to deal with attemtped communication to servers that have gone away
-                                  (http-transport:client-api-send-receive 0 conninfo cmd params)
-                                  ((commfail)(vector #f "communications fail"))
-                                  ((exn)(vector #f "other fail" (print-call-chain)))))
-			 (else
-			  (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
-			  (exit))))
-	     (success  (if (vector? dat) (vector-ref dat 0) #f))
-	     (res      (if (vector? dat) (vector-ref dat 1) #f)))
-	(if (and (vector? conninfo) (< 5 (vector-length conninfo)))
-            (http-transport:server-dat-update-last-access conninfo) ;; refresh access time
-	    (begin
-              (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
-              (set! conninfo #f)
-              (remote-conndat-set! *runremote* #f)
-              (http-transport:close-connections  area-dat: runremote)))
-	;; (mutex-unlock! *rmt-mutex*)
-        (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
-	(mutex-unlock! *rmt-mutex*)
-	(if success ;; success only tells us that the transport was successful, have to examine the data to see if there was a detected issue at the other end
-	    (if (and (vector? res)
-		     (eq? (vector-length res) 2)
-		     (eq? (vector-ref res 1) 'overloaded)) ;; since we are looking at the data to carry the error we'll use a fairly obtuse combo to minimise the chances of some sort of collision.
-                ;; this is the case where the returned data is bad or the server is overloaded and we want
-                ;; to ease off the queries
-		(let ((wait-delay (+ attemptnum (* attemptnum 10))))
-		  (debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
-		  (mutex-lock! *rmt-mutex*)
-		  (http-transport:close-connections area-dat: runremote)
-		  (set! *runremote* #f) ;; force starting over
-		  (mutex-unlock! *rmt-mutex*)
-		  (thread-sleep! wait-delay)
-		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-		res) ;; All good, return res
-	    (begin
-	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-	      (mutex-lock! *rmt-mutex*)
-              (remote-conndat-set!    runremote #f)
-	      (http-transport:close-connections area-dat: runremote)
-	      (remote-server-url-set! runremote #f)
-	      (mutex-unlock! *rmt-mutex*)
-              (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-	      ;; (if (not (server:check-if-running *toppath*))
-	      ;; 	  (server:start-and-wait *toppath*))
-	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
-
+     (else (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)))))
     ;;DOT }
-    
+
+;; bunch of small functions factored out of send-receive to make debug easier
+;;
+
+(define (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)
+  ;; (mutex-unlock! *rmt-mutex*)
+  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
+  ;; (mutex-lock! *rmt-mutex*)
+  (let* ((conninfo (remote-conndat runremote))
+	 (dat      (case (remote-transport runremote)
+		     ((http) (condition-case ;; handling here has
+					     ;; caused a lot of
+					     ;; problems. However it
+					     ;; is needed to deal with
+					     ;; attemtped
+					     ;; communication to
+					     ;; servers that have gone
+					     ;; away
+			      (http-transport:client-api-send-receive 0 conninfo cmd params)
+			      ((commfail)(vector #f "communications fail"))
+			      ((exn)(vector #f "other fail" (print-call-chain)))))
+		     (else
+		      (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
+		      (exit))))
+	 (success  (if (vector? dat) (vector-ref dat 0) #f))
+	 (res      (if (vector? dat) (vector-ref dat 1) #f)))
+    (if (and (vector? conninfo) (< 5 (vector-length conninfo)))
+	(http-transport:server-dat-update-last-access conninfo) ;; refresh access time
+	(begin
+	  (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
+	  (set! conninfo #f)
+	  (remote-conndat-set! *runremote* #f) ;; NOTE: *runremote* is global copy of runremote. Purpose: factor out global.
+	  (http-transport:close-connections  area-dat: runremote)))
+    (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
+    (mutex-unlock! *rmt-mutex*)
+    (if success ;; success only tells us that the transport was
+	;; successful, have to examine the data to see if
+	;; there was a detected issue at the other end
+	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+	(extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+	)))
+
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions
 ;;    exn
 ;;    (begin
@@ -363,11 +342,11 @@
 	 (resdat         (if (not (and read-only qry-is-write))
 			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
 			       (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong..
 				exn               ;;  This is an attempt to detect that situation and recover gracefully
 				(begin
-				  (debug:print0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn))
+				  (debug:print 0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn))
 				  (vector #t '())) ;; should always get a vector but if something goes wrong return a dummy
 				(if (and (vector? v)
 					 (> (vector-length v) 1))
 				    (let ((newvec (vector (vector-ref v 0)(vector-ref v 1))))
 				      newvec)           ;; by copying the vector while inside the error handler we should force the detection of a corrupted record
@@ -951,5 +930,11 @@
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+(set-functions rmt:send-receive                       remote-server-url-set!
+	       http-transport:close-connections	      remote-conndat-set!
+	       debug:print                            debug:print-info
+	       remote-ro-mode                         remote-ro-mode-set!
+	       remote-ro-mode-checked-set!            remote-ro-mode-checked)

ADDED   rmtmod.scm
Index: rmtmod.scm
==================================================================
--- /dev/null
+++ rmtmod.scm
@@ -0,0 +1,119 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit rmtmod))
+(declare (uses commonmod))
+
+(module rmtmod
+	*
+	
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+(import commonmod)
+
+;; Hack to make these functions visible to the refactored code, goal is to eliminate these over time.
+(define (rmt:send-receive . params) #f)
+(define (http-transport:close-connections . params) #f)
+;; from remote defstruct in common.scm
+(define (remote-conndat-set! . params) #f)
+(define (remote-server-url-set! . params) #f)
+(define (remote-ro-mode . params) #f)
+(define (remote-ro-mode-set! . params) #f)
+(define (remote-ro-mode-checked-set! . params) #f)
+(define (remote-ro-mode-checked . params) #f)
+(define (debug:print . params) #f)
+(define (debug:print-info . params) #f)
+
+(define (set-functions send-receive        rsus
+		       close-connections   rcs
+		       dbgp                dbgpinfo
+		       ro-mode             ro-mode-set
+		       ro-mode-checked-set ro-mode-checked
+		       ) 
+  (set! rmt:send-receive                 send-receive)
+  (set! remote-server-url-set!           rsus)
+  (set! http-transport:close-connections close-connections)
+  (set! remote-conndat-set!              rcs)
+  (set! debug:print                      dbgp)
+  (set! debug:print-info                 dbgpinfo)
+  (set! remote-ro-mode                   ro-mode)
+  (set! remote-ro-mode-set!              ro-mode-set)
+  (set! remote-ro-mode-checked-set!      ro-mode-checked-set)
+  (set! remote-ro-mode-checked           ro-mode-checked))
+
+(define (rmtmod:calc-ro-mode runremote *toppath*)
+  (if (and runremote
+	   (remote-ro-mode-checked runremote))
+      (remote-ro-mode runremote)
+      (let* ((dbfile  (conc *toppath* "/megatest.db"))
+	     (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
+	(if runremote
+	    (begin
+	      (remote-ro-mode-set! runremote ro-mode)
+	      (remote-ro-mode-checked-set! runremote #t)
+	      ro-mode)
+	    ro-mode))))
+
+(define (extras-readonly-mode rmt-mutex log-port cmd params)
+  (mutex-unlock! rmt-mutex)
+  (debug:print-info 12 log-port "rmt:send-receive, case 3")
+  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
+  #f)
+
+(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
+  (mutex-lock! *rmt-mutex*)
+  (remote-conndat-set!    runremote #f)
+  (http-transport:close-connections area-dat: runremote)
+  (remote-server-url-set! runremote #f)
+  (mutex-unlock! *rmt-mutex*)
+  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+  
+(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+  (if (and (vector? res)
+	   (eq? (vector-length res) 2)
+	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
+						 ;; looking at the
+						 ;; data to carry the
+						 ;; error we'll use a
+						 ;; fairly obtuse
+						 ;; combo to minimise
+						 ;; the chances of
+						 ;; some sort of
+						 ;; collision.  this
+						 ;; is the case where
+						 ;; the returned data
+						 ;; is bad or the
+						 ;; server is
+						 ;; overloaded and we
+						 ;; want to ease off
+						 ;; the queries
+      (let ((wait-delay (+ attemptnum (* attemptnum 10))))
+	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
+	(mutex-lock! *rmt-mutex*)
+	(http-transport:close-connections area-dat: runremote)
+	(set! *runremote* #f) ;; force starting over
+	(mutex-unlock! *rmt-mutex*)
+	(thread-sleep! wait-delay)
+	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+      res)) ;; All good, return res
+
+)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -246,11 +246,11 @@
 		   );; obviously haven't had any work to do for a while
         	  (else 0)))
   
   (let* ((num-running             (rmt:get-count-tests-running run-id))
 	 (num-running-in-jobgroup (rmt:get-count-tests-running-in-jobgroup run-id jobgroup))
-	 (job-group-limit         (let ((jobg-count (config-lookup *configdat* "jobgroups" jobgroup)))
+	 (job-group-limit         (let ((jobg-count (configf:lookup *configdat* "jobgroups" jobgroup)))
 				    (if (string? jobg-count)
 					(string->number jobg-count)
 					jobg-count))))
     (if (> (+ num-running num-running-in-jobgroup) 0)
 	(runs:inc-can-run-more-tests-count runsdat)) ;; (set! *runs:can-run-more-tests-count* (+ *runs:can-run-more-tests-count* 1)))
@@ -386,11 +386,12 @@
          (waitors-upon       (make-hash-table)) ;; given a test, return list of tests waiting upon this test.
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 ;; (tdbdat             (tasks:open-db))
 	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
 			       (if x (string->number x) #f)))
-	 (allowed-tests      #f))
+	 (allowed-tests      #f)
+	 (runconf            #f))
 
     ;; check if readonly
     (when readonly-mode
       (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed.")
       (exit 1))
@@ -546,11 +547,11 @@
 	  (let*-values (((waitons waitors config) (tests:get-waitons hed all-tests-registry))
 
 			;; NOTE: Have the config - can extract [waitons] section
 			
                         ((hed-mode)
-                         (let ((m (config-lookup config "requirements" "mode")))
+                         (let ((m (configf:lookup config "requirements" "mode")))
                            (if m (map string->symbol (string-split m)) '(normal))))
                         ((hed-itemized-waiton) ;; are items in hed waiting on items of waiton?
                          (not (null? (lset-intersection eq? hed-mode '(itemmatch itemwait)))))
                         )
 	    (debug:print-info 8 *default-log-port* "waitons: " waitons)
@@ -567,11 +568,11 @@
 	    (if (not (hash-table-ref/default test-records hed #f)) ;; waiton-tconfig below will be #f until that test is visted here at least once
 		(hash-table-set! test-records ;; BB: we are doing a manual make-tests:testqueue
 				 hed (vector hed     ;; 0 ;; testname
 					     config  ;; 1 
 					     waitons ;; 2 
-					     (config-lookup config "requirements" "priority")     ;; priority 3
+					     (configf:lookup config "requirements" "priority")     ;; priority 3
 					     (tests:get-items config) ;; 4 ;; expand the [items] and or [itemstable] into explict items
 					     #f      ;; itemsdat 5
 					     #f      ;; spare - used for item-path
 					     waitors ;; 
 					     )))
@@ -643,11 +644,11 @@
     (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
 		 (run-queue-retries 5)
-		 (th1        (make-thread (lambda ()
+		 #;(th1        (make-thread (lambda ()
 					    (handle-exceptions
 						exn
 						(begin
 						  (print-call-chain)
 						  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
@@ -663,13 +664,16 @@
 							       exn
 							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id)
 							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
 							run-ids)))
 					  "runs: mark-incompletes")))
-	    (thread-start! th1)
+	    ;; (thread-start! th1)
 	    (thread-start! th2)
-	    (thread-join! th1)
+	    ;; (thread-join! th1)
+	    ;; just do the main stuff in the main thread
+	    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+								    (any->number reglen) all-tests-registry)
 	    (set! keep-going #f)
 	    (thread-join! th2)
 	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
 	    (if (> run-count 0) ;; handle reruns
 		(begin
@@ -1343,11 +1347,11 @@
          (tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
          (sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
          (test-registry         (make-hash-table))
          (registry-mutex        (make-mutex))
          (num-retries           0)
-         (max-retries           (config-lookup *configdat* "setup" "maxretries"))
+         (max-retries           (configf:lookup *configdat* "setup" "maxretries"))
          (max-concurrent-jobs   (configf:lookup-number *configdat* "setup" "max_concurrent_jobs" default: 50))
          (reglen                (if (number? reglen-in) reglen-in 1))
          (last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
          (last-time-some-running (current-seconds))
          ;; (tdbdat                (tasks:open-db))
@@ -1413,12 +1417,12 @@
 
       ;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
       (let* ((test-record (hash-table-ref test-records hed))
 	     (test-name   (tests:testqueue-get-testname test-record))
 	     (tconfig     (tests:testqueue-get-testconfig test-record))
-	     (jobgroup    (config-lookup tconfig "test_meta" "jobgroup"))
-	     (testmode    (let ((m (config-lookup tconfig "requirements" "mode")))
+	     (jobgroup    (configf:lookup tconfig "test_meta" "jobgroup"))
+	     (testmode    (let ((m (configf:lookup tconfig "requirements" "mode")))
 			    (if m (map string->symbol (string-split m)) '(normal))))
 	     (itemmaps    (tests:get-itemmaps tconfig)) ;;  (configf:lookup tconfig "requirements" "itemmap"))
 	     (priority    (tests:testqueue-get-priority   test-record))
 	     (itemdat     (tests:testqueue-get-itemdat    test-record)) ;; itemdat can be a string, list or #f
 	     (items       (tests:testqueue-get-items      test-record))
@@ -1584,14 +1588,11 @@
                    (lambda (my-itemdat)
                      (tests:match test-patts hed (item-list->path my-itemdat) ))
                    ;; was: (tests:match test-patts hed (item-list->path my-itemdat) required: required-tests))
                    items) ))
             (if (null? items-in-testpatt)
-                (let ((test-id   (rmt:get-test-id run-id test-name "")))
-                  (debug:print-info 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching test pattern -- marking status ZERO_ITEMS")
-                  (if test-id
-                      (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "ZERO_ITEMS" "This test has no items which match test pattern.")))
+                (debug:print-error 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching the test pattern")
                 
                 (for-each (lambda (my-itemdat)
                             (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
                                                       (vector-copy! test-record newrec)
                                                       newrec))
@@ -1659,11 +1660,11 @@
 	  (loop (car reg)(cdr reg) '() reruns))
 	 (else
           (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-9")
 	  (debug:print-info 4 *default-log-port* "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
 	 ))) ;; end loop on sorted test names
-    ;; this is the point where everything is launced and now you can mark the run in metadata table as all launced 
+    ;; this is the point where everything is launched and now you can mark the run in metadata table as all launched 
     (rmt:set-var (conc "lunch-complete-" run-id) "yes")
   
     ;; now *if* -run-wait we wait for all tests to be done
     ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
     (thread-sleep! 10) ;; I think there is a race condition here. Let states/statuses settle
@@ -1879,15 +1880,27 @@
 			(configf:lookup test-conf "skip" "prevrunning"))
 		   ;; run-ids = #f means *all* runs
 		   (let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
 		     (if (not (null? running-tests)) ;; have to skip 
 			 (set! skip-test "Skipping due to previous tests running"))))
+
 		  ((and skip-check
 			(configf:lookup test-conf "skip" "fileexists"))
 		   (if (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
 		       (set! skip-test (conc "Skipping due to existance of file " (configf:lookup test-conf "skip" "fileexists")))))
+
 		  ((and skip-check
+			(configf:lookup test-conf "skip" "filenotexists"))
+		   (if (not (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
+		       (set! skip-test (conc "Skipping due to non existance of file " (configf:lookup test-conf "skip" "filenotexists")))))
+		 
+                  ((and skip-check
+			(configf:lookup test-conf "skip" "script"))
+		   (if (= (system (configf:lookup test-conf "skip" "script")) 0)
+                        (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))
+      
+                  ((and skip-check
 			(configf:lookup test-conf "skip" "rundelay"))
 		   ;; run-ids = #f means *all* runs
 		   (let* ((numseconds      (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
 			  (running-tests   (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
 			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
@@ -2541,11 +2554,11 @@
 	  (rmt:testmeta-add-record test-name)))
     (for-each 
      (lambda (key)
        (let* ((idx (cadr key))
 	      (fld (car  key))
-	      (val (config-lookup test-conf "test_meta" fld)))
+	      (val (configf:lookup test-conf "test_meta" fld)))
 	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
 	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
 	     (begin
 	       (print "Updating " test-name " " fld " to " val)
 	       (rmt:testmeta-update-field test-name fld val)))))
@@ -2576,11 +2589,11 @@
      (hash-table-keys test-names))))
 
 ;; This could probably be refactored into one complex query ...
 ;; NOT PORTED - DO NOT USE YET
 ;;
-(define (runs:rollup-run keys runname user keyvals)
+#;(define (runs:rollup-run keys runname user keyvals)
   (debug:print 4 *default-log-port* "runs:rollup-run, keys: " keys " -runname " runname " user: " user)
   (let* ((db              #f)
 	 ;; register run operates on the main db
 	 (new-run-id      (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))
 	 (prev-tests      (rmt:get-matching-previous-test-run-records new-run-id "%" "%"))

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -113,11 +113,11 @@
 	      (mdb          (cond ;; what the hek is *toppath* doing here?
 			     ((and (string? *toppath*)(file-write-access? *toppath*))
 			      (sqlite3:open-database dbfile))
 			     ((file-read-access? dbpath)    (sqlite3:open-database dbfile))
 			     (else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
-	      (handler      (make-busy-timeout 36000)))
+	      (handler      (sqlite3:make-busy-timeout 36000)))
 	 (if (and exists
 		  (not write-access))
 	     (set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
 	 (sqlite3:set-busy-handler! mdb handler)
 	 (db:set-sync mdb) ;; (sqlite3:execute mdb (conc "PRAGMA synchronous = 0;"))
@@ -279,11 +279,11 @@
      "SELECT count(id) FROM monitors WHERE last_update < (strftime('%s','now') - 300) AND username=?;"
      (car (user-information (current-user-id))))
     res))
 
 ;; 
-(define (tasks:start-monitor db mdb)
+#;(define (tasks:start-monitor db mdb)
   (if (> (tasks:get-num-alive-monitors mdb) 2) ;; have two running, no need for more
       (debug:print-info 1 *default-log-port* "Not starting monitor, already have more than two running")
       (let* ((megatestdb     (conc *toppath* "/megatest.db"))
 	     (monitordbf     (conc (db:dbfile-path #f) "/monitor.db"))
 	     (last-db-update 0)) ;; (file-modification-time megatestdb)))
@@ -443,23 +443,23 @@
   (db:with-db
    dbstruct #f #t
    (lambda (db)
      (sqlite3:execute db (conc "DELETE FROM tasks_queue WHERE id IN (" task-ids ");")))))
 
-(define (tasks:process-queue dbstruct)
+#;(define (tasks:process-queue dbstruct)
   (let* ((task   (tasks:snag-a-task dbstruct))
 	 (action (if task (tasks:task-get-action task) #f)))
     (if action (print "tasks:process-queue task: " task))
     (if action
 	(case (string->symbol action)
 	  ((run)       (tasks:start-run     dbstruct task))
 	  ((remove)    (tasks:remove-runs   dbstruct task))
 	  ((lock)      (tasks:lock-runs     dbstruct task))
 	  ;; ((monitor)   (tasks:start-monitor db task))
-	  ((rollup)    (tasks:rollup-runs   dbstruct task))
+	  #;((rollup)    (tasks:rollup-runs   dbstruct task))
 	  ((updatemeta)(tasks:update-meta   dbstruct task))
-	  ((kill)      (tasks:kill-monitors dbstruct task))))))
+	  #;((kill)      (tasks:kill-monitors dbstruct task))))))
 
 (define (tasks:tasks->text tasks)
   (let ((fmtstr "~10a~10a~10a~12a~20a~12a~12a~10a"))
     (conc (format #f fmtstr "id" "action" "owner" "state" "target" "runname" "testpatts" "params") "\n"
 	  (string-intersperse 
@@ -469,11 +469,11 @@
 			  (tasks:task-get-action task)
 			  (tasks:task-get-owner  task)
 			  (tasks:task-get-state  task)
 			  (tasks:task-get-target task)
 			  (tasks:task-get-name   task)
-			  (tasks:task-get-test   task)
+			  (tasks:task-get-testpatt task)
 			  ;; (tasks:task-get-item   task)
 			  (tasks:task-get-params task)))
 		tasks) "\n"))))
    
 (define (tasks:set-state dbstruct task-id state)

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -75,13 +75,13 @@
 					   dbexists)
 				       (sqlite3:open-database dbpath)
 				       (sqlite3:open-database ":memory:"))))
 	     (tdb-writeable       (and (file-write-access? work-area)
 				       (file-write-access? dbpath)))
-	     (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
-					       (string->number (args:get-arg "-override-timeout"))
-					       136000))))
+	     (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
+						       (string->number (args:get-arg "-override-timeout"))
+						       136000))))
 	
 	(if (and tdb-writeable
 		 *db-write-access*)
 	    (sqlite3:set-busy-handler! db handler))
 	(if (not dbexists)

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -42,10 +42,13 @@
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 (include "js-path.scm")
 
+(define (init-java-script-lib)
+  (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
+  )
 
 ;; Call this one to do all the work and get a standardized list of tests
 ;;   gets paths from configs and finds valid tests 
 ;;   returns hash of testname --> fullpath
 ;;
@@ -166,16 +169,16 @@
 ;; returns waitons waitors tconfigdat
 ;;
 (define (tests:get-waitons test-name all-tests-registry)
    (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
      (let ((instr (if config 
-		      (config-lookup config "requirements" "waiton")
+		      (configf:lookup config "requirements" "waiton")
 		      (begin ;; No config means this is a non-existant test
 			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
 			(exit 1))))
 	   (instr2 (if config
-		       (config-lookup config "requirements" "waitor")
+		       (configf:lookup config "requirements" "waitor")
 		       "")))
        (debug:print-info 8 *default-log-port* "waitons string is " instr ", waitors string is " instr2)
        (let ((newwaitons
 	      (string-split (cond
 			     ((procedure? instr) ;; here 
@@ -1620,12 +1623,12 @@
 		       (b-record   (hash-table-ref test-records b))
 		       (a-waitons  (or (tests:testqueue-get-waitons a-record) '()))
 		       (b-waitons  (or (tests:testqueue-get-waitons b-record) '()))
 		       (a-config   (tests:testqueue-get-testconfig  a-record))
 		       (b-config   (tests:testqueue-get-testconfig  b-record))
-		       (a-raw-pri  (config-lookup a-config "requirements" "priority"))
-		       (b-raw-pri  (config-lookup b-config "requirements" "priority"))
+		       (a-raw-pri  (configf:lookup a-config "requirements" "priority"))
+		       (b-raw-pri  (configf:lookup b-config "requirements" "priority"))
 		       (a-priority (mungepriority a-raw-pri))
 		       (b-priority (mungepriority b-raw-pri)))
 		  (tests:testqueue-set-priority! a-record a-priority)
 		  (tests:testqueue-set-priority! b-record b-priority)
 		  ;; (debug:print 0 *default-log-port* "a=" a ", b=" b ", a-waitons=" a-waitons ", b-waitons=" b-waitons)
@@ -1815,11 +1818,11 @@
 		 (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
 	(debug:print-info 4 *default-log-port* "hed=" hed " at top of loop")
         ;; don't know item-path at this time, let the testconfig get the top level testconfig
 	(let* ((config  (tests:get-testconfig hed #f all-tests-registry 'return-procs))
 	       (waitons (let ((instr (if config 
-					 (config-lookup config "requirements" "waiton")
+					 (configf:lookup config "requirements" "waiton")
 					 (begin ;; No config means this is a non-existant test
 					   (debug:print-error 0 *default-log-port* "non-existent required test \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
 					     ""))))
 			  (debug:print-info 8 *default-log-port* "waitons string is " instr)
 			  (string-split (cond
@@ -1848,11 +1851,11 @@
 		(if (not (hash-table-ref/default test-records hed #f))
 		    (hash-table-set! test-records
 				     hed (vector hed     ;; 0
 						 config  ;; 1
 						 waitons ;; 2
-						 (config-lookup config "requirements" "priority")     ;; priority 3
+						 (configf:lookup config "requirements" "priority")     ;; priority 3
 						 (let ((items      (hash-table-ref/default config "items" #f)) ;; items 4
 						       (itemstable (hash-table-ref/default config "itemstable" #f))) 
 						   ;; if either items or items table is a proc return it so test running
 						   ;; process can know to call items:get-items-from-config
 						   ;; if either is a list and none is a proc go ahead and call get-items
@@ -1930,11 +1933,11 @@
 	 (uname    (get-uname "-srvpio"))
 	 (hostname (get-host-name)))
     (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
     
 ;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
-(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
+#;(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
   (let* ((cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory)))
 	 (remtries 10))
     (handle-exceptions
      exn

Index: tests/unittests/all-api.scm
==================================================================
--- tests/unittests/all-api.scm
+++ tests/unittests/all-api.scm
@@ -75,12 +75,10 @@
 (test #f '(-1 . 0) (vector-ref (api:execute-requests my-dbstruct (vector 'get-latest-host-load (list "localhost"))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-changed-record-ids (list 0))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-record-ids (list "%" 1 keys "%/%"))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-not-completed-cnt (list 1))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-tags (list ))) 0))
-;; no such query supported in api.scm, but it is is the list of read-only queries.
-;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-times (list ))) 0))
 (test #f '("SYSTEM" "RELEASE") (vector-ref (api:execute-requests my-dbstruct (vector 'get-keys-write (list ))) 1))
 (test #f  (vector '("SYSTEM" "RELEASE") '())(vector-ref (api:execute-requests my-dbstruct (vector 'get-targets (list 1 ))) 1))
 (test #f "" (vector-ref (api:execute-requests my-dbstruct (vector 'get-target (list 1 ))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'register-test 1 1 "foo" ""))) 0))
 (test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'get-test-id (list 1 "foo" ""))) 1))
@@ -87,16 +85,12 @@
 (test #f "/tmp/badname" (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-rundir-from-test-id (list 1 1))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-tests-state-status (list 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status-by-id (list 1 1 "COMPLETED" "PASS" "Just testing!"))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run (list 1 "%" '() '() #f #f #f #f #f #f 0 #f))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run-mindata (list 1  "%" '("COMPLETED") '("PASS") #f ))) 0))
-;; api.scm calls db:get-tests-for-runs-mindata, which does not exist.
-;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-runs-mindata (list 1  "%" '("COMPLETED") '("PASS") #f ))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-test-records (list 1 2 ))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status (list 1 1 "COMPLETED" "FAIL" "Another message" ))) 0))
-;; api.scm calls db:get-previous-test-run-record, which does not exist.
-;;(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector "get-previous-test-run-record" (list 1 ))) 1))
 (test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-matching-previous-test-run-records (list 1 "foo" ""))) 1))
 (test #f '("/tmp/badname" "logs/final.log") (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-logfile-info (list 1 "foo"))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-records-for-index-file (list 1 "foo"))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-testinfo-state-status (list 1 1))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'test-set-log 1 "/tmp/another/logfile/eh" 1))) 0))
@@ -157,13 +151,25 @@
 (test #f "value1" (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get/default (list "field1" #f))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-del! (list "field1"))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get-lock (list "mykey"))) 0))
 (test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-disk (list "mydisk" "/usr/mydisk" 10000000))) 1))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-block-name (list 1 "/usr/mydisk/myblock"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-archive-block-info (list 1 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'ping (list ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'kill-server (list ))) 0))
+
+;; api.scm calls db:get-previous-test-run-record, which does not exist.
+;;(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector "get-previous-test-run-record" (list 1 ))) 1))
+
+;; no such query supported in api.scm, but it is is the list of read-only queries.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-times (list ))) 0))
+
+;; api.scm calls db:get-tests-for-runs-mindata, which does not exist.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-runs-mindata (list 1  "%" '("COMPLETED") '("PASS") #f ))) 0))
+
 ;;This api function calls db:archive-allocate-testsuite/area-to-block, which does not exist.
 ;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-allocate-testsuite/area-to-block (list 1 "/usr/mydisk/myblock"))) 0))
-(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-archive-block-info (list 1 ))) 0))
 
 ;;debug this: ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: (0 . last_update)
 ;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'sync-inmem->db (list 1))) 0))
 
 ;;debug this. Error: bad argument count - received 0 but expected 5: #<procedure (db:get-runs dbstruct3787 runpatt3788 count3789 offset3790 keypatts3...
@@ -170,7 +176,5 @@
 ;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'synchash-get (list 1 (db:get-runs) "foo" 1 (list "%" 10 0 keypatts)))) 0))
 
 ;;debug this. Call of non-procedure
 ;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'sdb-qry (list "sdb-db"))) 0))
 
-(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'ping (list ))) 0))
-(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'kill-server (list ))) 0))

ADDED   utils/gen-build-info.sh
Index: utils/gen-build-info.sh
==================================================================
--- /dev/null
+++ utils/gen-build-info.sh
@@ -0,0 +1,16 @@
+echo "Data gathered on $(date)"
+echo
+echo "Megatest code node: $(fossil status | grep checkout: | awk '{print $2}')"
+echo
+echo "Host: $HOSTNAME"
+echo
+echo "Which csi: $(which csi)"
+echo
+echo "Version info from csc -version:"
+csc -version
+echo
+echo "Eggs info from chicken-status:"
+chicken-status
+echo
+echo "Host info from lsb_release -a:"
+lsb_release -a

Index: vg.scm
==================================================================
--- vg.scm
+++ vg.scm
@@ -563,11 +563,11 @@
 	;;     (begin
 	;; 	(canvas-foreground-set! cnv fill-color)
 	;; 	(canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
 	  (if line-color
 	      (canvas-foreground-set! cnv line-color)
-	      (if fill-color
+	      #;(if fill-color
 		  (canvas-foreground-set! cnv prev-foreground-color)))
 	  (canvas-line! cnv llx ulx lly uly)
 	  (canvas-foreground-set! cnv prev-foreground-color)
 	  (if text 
 	      (let* ((prev-font    (canvas-font cnv))