Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -20,21 +20,22 @@
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm runconfig.scm	\
-           server.scm configf.scm db.scm margs.scm		\
-           process.scm runs.scm tasks.scm tests.scm genexample.scm	\
+           server.scm configf.scm db.scm		\
+           process.scm runs.scm tests.scm genexample.scm	\
            http-transport.scm filedb.scm tdb.scm client.scm mt.scm	\
            ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
            subrun.scm archive.scm env.scm		\
-           diff-report.scm cgisetup/models/pgdb.scm
+           diff-report.scm
 
 # module source files
-MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm ods.scm configfmod.scm transport.scm portlogger.scm
+MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm pgdb.scm margsmod.scm
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
+
 # ftail.scm rmtmod.scm commonmod.scm removed
 # MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
 #             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
 #             rmtmod.scm apimod.scm
 
@@ -112,18 +113,16 @@
 	env.o \
 	http-transport.o \
 	items.o \
 	launch.o \
 	lock-queue.o \
-	margs.o \
 	mt.o \
 	process.o \
 	rmt.o \
 	runconfig.o \
 	runs.o \
 	server.o \
-	tasks.o \
 	tdb.o \
 	tests.o \
 	subrun.o \
         ezsteps.o
 
@@ -189,11 +188,11 @@
 # # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm
 # 
 # tests.o db.o launch.o runs.o dashboard-tests.o				\
 # # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm
 # 
-# tests.o db.o launch.o runs.o dashboard-tests.o				\
+# tests.o db.o launch.o runs.o dashboard-tests.o				
 
 dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o	\
 monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm
 
 # dashboard.o : mofiles/apimod.o
@@ -200,11 +199,11 @@
 
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 
 db.o ezsteps.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 
-tests.o tasks.o dashboard-tasks.o : task_records.scm
+tests.o mofiles/tasks.o dashboard-tasks.o : task_records.scm
 
 runs.o : test_records.scm
 # api.o rmt.o db.o : mofiles/apimod.o mofiles/dbmod.o mofiles/rmtmod.o mofiles/ods.o
 
 mofiles/commonmod.o common.o megatest.o dashboard.o : megatest-fossil-hash.scm megatest-version.scm
@@ -461,18 +460,18 @@
 
 xterm : sd
 	(export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &)
 
 datashare-testing/spublish : spublish.scm $(OFILES) megatest-version.scm
-	csc $(CSCOPTS) spublish.scm margs.o process.o common.o  -o datashare-testing/spublish
+	csc $(CSCOPTS) spublish.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/spublish
 
 datashare-testing/sretrieve : sretrieve.scm $(OFILES) megatest-version.scm
-	csc $(CSCOPTS) sretrieve.scm margs.o process.o common.o  -o datashare-testing/sretrieve
+	csc $(CSCOPTS) sretrieve.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/sretrieve
 
 
 datashare-testing/sauthorize : sauthorize.scm $(OFILES) megatest-version.scm
-	 csc $(CSCOPTS) sauthorize.scm margs.o process.o common.o  -o datashare-testing/sauthorize
+	 csc $(CSCOPTS) sauthorize.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/sauthorize
 
 sauth-init:
 	mkdir -p  datashare-testing
 	rm  datashare-testing/sauthorize
 	rm  datashare-testing/sretrieve 
@@ -495,12 +494,12 @@
 	fi
 	if csi -ne '(use postgresql)';then \
 	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
-portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o margs.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
-	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o margs.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o
+	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o
 
 # create a pdf dot graphviz diagram from notations in rmt.scm
 rmt.pdf : rmt.scm
 	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
 

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -34,279 +34,5 @@
 (import apimod)
 
 (declare (uses dbmod))
 (import dbmod)
 
-;; These are called by the server on recipt of /api calls
-;;    - keep it simple, only return the actual result of the call, i.e. no meta info here
-;;
-;;    - returns #( flag result )
-;;
-(define (api:execute-requests dbstruct dat)
-  (handle-exceptions
-   exn
-   (let ((call-chain (get-call-chain)))
-     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an exception from peer, dat=" dat ", exn=" exn)
-     (print-call-chain (current-error-port))
-     (debug:print 0 *default-log-port* " message: "  ((condition-property-accessor 'exn 'message) exn))       
-     (vector #f (vector exn call-chain dat))) ;; return some stuff for debug if an exception happens
-   (cond
-    ((not (vector? dat))                    ;; it is an error to not receive a vector
-     (vector #f (vector #f "remote must be called with a vector")))
-    ((> *api-process-request-count* 20) ;; 20)
-     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an overloaded message.")
-     (set! *server-overloaded* #t)
-     (vector #f (vector #f 'overloaded))) ;; the inner vector is what gets returned. nope, don't know why. please refactor!
-    (else  
-     (let* ((cmd-in            (vector-ref dat 0))
-            (cmd               (if (symbol? cmd-in)
-				   cmd-in
-				   (string->symbol cmd-in)))
-            (params            (vector-ref dat 1))
-            (start-t           (current-milliseconds))
-            (readonly-mode     (dbr:dbstruct-read-only dbstruct))
-            (readonly-command  (member cmd api:read-only-queries))
-            (writecmd-in-readonly-mode (and readonly-mode (not readonly-command)))
-            #;(foo               (begin
-                                 (common:telemetry-log (conc "api-in:"(->string cmd))
-                                                       payload: `((params . ,params)))
-                                 
-                                 #t))
-            (res    
-             (if writecmd-in-readonly-mode
-                 (conc "attempt to run write command "cmd" on a read-only database")
-                 (case cmd
-                   ;;===============================================
-                   ;; READ/WRITE QUERIES
-                   ;;===============================================
-
-                   ((get-keys-write)                        (db:get-keys dbstruct)) ;; force a dummy "write" query to force server; for debug in -repl
-                   
-                   ;; SERVERS
-                   ((start-server)                    (apply server:kind-run params))
-                   ((kill-server)                     (set! *server-run* #f))
-
-                   ;; TESTS
-
-                   ;;((test-set-state-status-by-id)     (apply mt:test-set-state-status-by-id dbstruct params))
-                   ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items.
-                   ((test-set-state-status-by-id)
-
-                    ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
-                    (db:set-state-status-and-roll-up-items
-                     dbstruct
-                     (list-ref params 0) ; run-id
-                     (list-ref params 1) ; test-name
-                     #f                  ; item-path
-                     (list-ref params 2) ; state
-                     (list-ref params 3) ; status
-                     (list-ref params 4) ; comment
-                     ))
-                   
-                   ((delete-test-records)             (apply db:delete-test-records dbstruct params))
-                   ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params))
-                   ((test-set-state-status)           (apply db:test-set-state-status dbstruct params))
-                   ((test-set-top-process-pid)        (apply db:test-set-top-process-pid dbstruct params))
-                   ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params))
-                   ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params)) 
-                   ((top-test-set-per-pf-counts)      (apply db:top-test-set-per-pf-counts dbstruct params))
-                   ((test-set-archive-block-id)       (apply db:test-set-archive-block-id dbstruct params))
-
-                   ;; RUNS
-                   ((register-run)                 (apply db:register-run dbstruct params))
-                   ((set-tests-state-status)       (apply db:set-tests-state-status dbstruct params))
-                   ((delete-run)                   (apply db:delete-run dbstruct params))
-                   ((lock/unlock-run)              (apply db:lock/unlock-run dbstruct params))
-                   ((update-run-event_time)        (apply db:update-run-event_time dbstruct params))
-                   ((update-run-stats)             (apply db:update-run-stats dbstruct params))
-                   ((set-var)                      (apply db:set-var dbstruct params))
-                   ((inc-var)                      (apply db:inc-var dbstruct params))
-		   ((dec-var)                      (apply db:dec-var dbstruct params))
-                   ((del-var)                      (apply db:del-var dbstruct params))
-		   ((add-var)                      (apply db:add-var dbstruct params))
-
-                   ;; STEPS
-                   ((teststep-set-status!)         (apply db:teststep-set-status! dbstruct params))
-                   ((delete-steps-for-test!)        (apply db:delete-steps-for-test! dbstruct params))
-                   
-                   ;; TEST DATA
-                   ((test-data-rollup)             (apply db:test-data-rollup dbstruct params))
-                   ((csv->test-data)               (apply db:csv->test-data dbstruct params))
-
-                   ;; MISC
-                   ((sync-inmem->db)               (let ((run-id (car params)))
-                                                     (db:sync-touched dbstruct run-id force-sync: #t)))
-                   ((mark-incomplete)              (apply db:find-and-mark-incomplete dbstruct params))
-                   ((create-all-triggers)          (db:create-all-triggers dbstruct))
-                   ((drop-all-triggers)            (db:drop-all-triggers dbstruct)) 
-
-                   ;; TESTMETA
-                   ((testmeta-add-record)       (apply db:testmeta-add-record dbstruct params))
-                   ((testmeta-update-field)     (apply db:testmeta-update-field dbstruct params))
-                   ((get-tests-tags)            (db:get-tests-tags dbstruct))
-
-                   ;; TASKS
-                   ((tasks-add)                 (apply tasks:add dbstruct params))   
-                   ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params))
-                   ((tasks-get-last)            (apply tasks:get-last dbstruct params))
-
-		   ;; NO SYNC DB
-		   ((no-sync-set)               (apply db:no-sync-set         *no-sync-db* params))
-		   ((no-sync-get/default)       (apply db:no-sync-get/default *no-sync-db* params))
-		   ((no-sync-del!)              (apply db:no-sync-del!        *no-sync-db* params))
-		   ((no-sync-get-lock)          (apply db:no-sync-get-lock    *no-sync-db* params))
-		   
-                   ;; 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))
-
-                   ;;======================================================================
-                   ;; READ ONLY QUERIES
-                   ;;======================================================================
-
-                   ;; KEYS
-                   ((get-key-val-pairs)               (apply db:get-key-val-pairs dbstruct params))
-                   ((get-keys)                        (db:get-keys dbstruct))
-                   ((get-key-vals)                    (apply db:get-key-vals dbstruct params))
-                   ((get-target)                      (apply db:get-target dbstruct params))
-                   ((get-targets)                     (db:get-targets dbstruct))
-
-                   ;; ARCHIVES
-                   ((test-get-archive-block-info)     (apply db:test-get-archive-block-info dbstruct params))
-                   
-                   ;; TESTS
-                   ((test-toplevel-num-items)         (apply db:test-toplevel-num-items dbstruct params))
-                   ((get-test-info-by-id)	       (apply db:get-test-info-by-id dbstruct params))
-                   ((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-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))
-                   ((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))
-                   ((get-run-status)               (apply db:get-run-status dbstruct params))
-                   ((get-run-state)                (apply db:get-run-state dbstruct params))
-                   ((set-run-status)               (apply db:set-run-status dbstruct params))
-                   ((set-run-state-status)  			 (apply db:set-run-state-status dbstruct params))
-                   ((update-tesdata-on-repilcate-db) (apply db:update-tesdata-on-repilcate-db  dbstruct params)) 
-                   ((get-tests-for-run)            (apply db:get-tests-for-run dbstruct params))
-                   ((get-tests-for-run-state-status) (apply db:get-tests-for-run-state-status 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-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))
-                   ((get-prev-run-ids)             (apply db:get-prev-run-ids dbstruct params))
-                   ((get-run-ids-matching-target)  (apply db:get-run-ids-matching-target dbstruct params))
-                   ((get-runs-by-patt)             (apply db:get-runs-by-patt dbstruct params))
-                   ((get-run-name-from-id)         (apply db:get-run-name-from-id dbstruct params))
-                   ((get-main-run-stats)           (apply db:get-main-run-stats dbstruct params))
-                   ((get-var)                      (apply db:get-var dbstruct params))
-                   ((get-run-stats)                (apply db:get-run-stats dbstruct params))
-                   ((get-run-times)                (apply db:get-run-times dbstruct params)) 
-
-                   ;; STEPS
-                   ((get-steps-data)               (apply db:get-steps-data dbstruct params))
-                   ((get-steps-for-test)           (apply db:get-steps-for-test dbstruct params))
-		   ((get-steps-info-by-id)         (apply db:get-steps-info-by-id dbstruct params))
-
-                   ;; TEST DATA
-                   ((read-test-data)               (apply db:read-test-data dbstruct params))
-                   ((read-test-data-varpatt)       (apply db:read-test-data-varpatt dbstruct params))
-                   ((get-data-info-by-id)          (apply db:get-data-info-by-id dbstruct params)) 
-
-                   ;; MISC
-                   ((get-latest-host-load)         (apply db:get-latest-host-load dbstruct params))
-                   ((have-incompletes?)            (apply db:have-incompletes? dbstruct params))
-                   ((login)                        (apply db:login dbstruct params))
-                   ((general-call)                 (let ((stmtname   (car params))
-                                                         (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))	
-                   ;; TESTMETA
-                   ((testmeta-get-record)       (apply db:testmeta-get-record dbstruct params))
-
-                   ;; TASKS 
-                   ((find-task-queue-records)   (apply tasks:find-task-queue-records dbstruct params))
-		   (else
-		    (debug:print 0 *default-log-port* "ERROR: bad api call " cmd)
-		    (conc "ERROR: BAD api call " cmd))))))
-
-       
-       ;; save all stats
-       (let ((delta-t (- (current-milliseconds)
-			 start-t)))
-	 (hash-table-set! *db-api-call-time* cmd
-			  (cons delta-t (hash-table-ref/default *db-api-call-time* cmd '()))))
-       (if writecmd-in-readonly-mode
-           (begin
-             #;(common:telemetry-log (conc "api-out:"(->string cmd))
-                                   payload: `((params . ,params)
-                                              (ok-res . #t)))
-	     (vector #f res))
-           (begin
-             #;(common:telemetry-log (conc "api-out:"(->string cmd))
-                                   payload: `((params . ,params)
-                                              (ok-res . #f)))
-             (vector #t res))))))))
-
-;; http-server  send-response
-;;                 api:process-request
-;;                    db:*
-;;
-;; NB// Runs on the server as part of the server loop
-;;
-(define (api:process-request dbstruct $) ;; the $ is the request vars proc
-  (debug:print 4 *default-log-port* "server-id:"  *server-id*)
-  (let* ((cmd     ($ 'cmd))
-	 (paramsj ($ 'params))
-         (key     ($ 'key))   
-	 (params  (db:string->obj paramsj transport: 'http))) ;; incoming data from the POST (or is it a GET?)
-    (debug:print 4 *default-log-port* "cmd:" cmd " with params " params "key " key)
-    (if (equal? key *server-id*)
-      (begin
-        (set! *api-process-request-count* (+ *api-process-request-count* 1))
- 	(let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
-	       (success (vector-ref resdat 0))
-	       (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
-	  (debug:print 4 *default-log-port* "res:" res)
-	  (if (not success)
-	      (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
-	  (if (> *api-process-request-count* *max-api-process-requests*)
-	      (set! *max-api-process-requests* *api-process-request-count*))
-	  (set! *api-process-request-count* (- *api-process-request-count* 1))
-	  ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
-	  ;; (rmt:dat->json-str
-	  ;;  (if (or (string? res)
-	  ;;          (list?   res)
-	  ;;          (number? res)
-	  ;;          (boolean? res))
-	  ;;      res 
-	  ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
-	  (db:obj->string res transport: 'http)))
-	(begin
-	  (debug:print 0 *default-log-port*   "Server refused to process request. Sever id mismatch. recived " key " expected:  " *server-id* ".\nOther arguments recived: cmd=" cmd " params = " params) 
-	  (db:obj->string (conc "Server refused to process request server-id mismatch: " key ", " *server-id*) transport: 'http)))))
-

Index: apimod.scm
==================================================================
--- apimod.scm
+++ apimod.scm
@@ -18,18 +18,21 @@
 
 ;;======================================================================
 
 (declare (unit apimod))
 (declare (uses commonmod))
-;; (declare (uses ulex))
+(declare (uses dbmod))
+(declare (uses tasks))
 
 (module apimod
 	*
 	
 (import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69)
 (import commonmod)
+(import dbmod)
+(import tasks)
 
 ;; allow these queries through without starting a server
 ;;
 (define api:read-only-queries
   '(get-key-val-pairs
@@ -136,6 +139,280 @@
 
     ;; TASKS
     tasks-add
     tasks-set-state-given-param-key
     ))
+;; These are called by the server on recipt of /api calls
+;;    - keep it simple, only return the actual result of the call, i.e. no meta info here
+;;
+;;    - returns #( flag result )
+;;
+(define (api:execute-requests dbstruct dat)
+  (handle-exceptions
+   exn
+   (let ((call-chain (get-call-chain)))
+     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an exception from peer, dat=" dat ", exn=" exn)
+     (print-call-chain (current-error-port))
+     (debug:print 0 *default-log-port* " message: "  ((condition-property-accessor 'exn 'message) exn))       
+     (vector #f (vector exn call-chain dat))) ;; return some stuff for debug if an exception happens
+   (cond
+    ((not (vector? dat))                    ;; it is an error to not receive a vector
+     (vector #f (vector #f "remote must be called with a vector")))
+    ((> *api-process-request-count* 20) ;; 20)
+     (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an overloaded message.")
+     (set! *server-overloaded* #t)
+     (vector #f (vector #f 'overloaded))) ;; the inner vector is what gets returned. nope, don't know why. please refactor!
+    (else  
+     (let* ((cmd-in            (vector-ref dat 0))
+            (cmd               (if (symbol? cmd-in)
+				   cmd-in
+				   (string->symbol cmd-in)))
+            (params            (vector-ref dat 1))
+            (start-t           (current-milliseconds))
+            (readonly-mode     (dbr:dbstruct-read-only dbstruct))
+            (readonly-command  (member cmd api:read-only-queries))
+            (writecmd-in-readonly-mode (and readonly-mode (not readonly-command)))
+            #;(foo               (begin
+                                 (common:telemetry-log (conc "api-in:"(->string cmd))
+                                                       payload: `((params . ,params)))
+                                 
+                                 #t))
+            (res    
+             (if writecmd-in-readonly-mode
+                 (conc "attempt to run write command "cmd" on a read-only database")
+                 (case cmd
+                   ;;===============================================
+                   ;; READ/WRITE QUERIES
+                   ;;===============================================
+
+                   ((get-keys-write)                        (db:get-keys dbstruct)) ;; force a dummy "write" query to force server; for debug in -repl
+                   
+                   ;; SERVERS
+                   ((start-server)                    (apply server:kind-run params))
+                   ((kill-server)                     (set! *server-run* #f))
+
+                   ;; TESTS
+
+                   ;;((test-set-state-status-by-id)     (apply mt:test-set-state-status-by-id dbstruct params))
+                   ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items.
+                   ((test-set-state-status-by-id)
+
+                    ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment)
+                    (db:set-state-status-and-roll-up-items
+                     dbstruct
+                     (list-ref params 0) ; run-id
+                     (list-ref params 1) ; test-name
+                     #f                  ; item-path
+                     (list-ref params 2) ; state
+                     (list-ref params 3) ; status
+                     (list-ref params 4) ; comment
+                     ))
+                   
+                   ((delete-test-records)             (apply db:delete-test-records dbstruct params))
+                   ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params))
+                   ((test-set-state-status)           (apply db:test-set-state-status dbstruct params))
+                   ((test-set-top-process-pid)        (apply db:test-set-top-process-pid dbstruct params))
+                   ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params))
+                   ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params)) 
+                   ((top-test-set-per-pf-counts)      (apply db:top-test-set-per-pf-counts dbstruct params))
+                   ((test-set-archive-block-id)       (apply db:test-set-archive-block-id dbstruct params))
+
+                   ;; RUNS
+                   ((register-run)                 (apply db:register-run dbstruct params))
+                   ((set-tests-state-status)       (apply db:set-tests-state-status dbstruct params))
+                   ((delete-run)                   (apply db:delete-run dbstruct params))
+                   ((lock/unlock-run)              (apply db:lock/unlock-run dbstruct params))
+                   ((update-run-event_time)        (apply db:update-run-event_time dbstruct params))
+                   ((update-run-stats)             (apply db:update-run-stats dbstruct params))
+                   ((set-var)                      (apply db:set-var dbstruct params))
+                   ((inc-var)                      (apply db:inc-var dbstruct params))
+		   ((dec-var)                      (apply db:dec-var dbstruct params))
+                   ((del-var)                      (apply db:del-var dbstruct params))
+		   ((add-var)                      (apply db:add-var dbstruct params))
+
+                   ;; STEPS
+                   ((teststep-set-status!)         (apply db:teststep-set-status! dbstruct params))
+                   ((delete-steps-for-test!)        (apply db:delete-steps-for-test! dbstruct params))
+                   
+                   ;; TEST DATA
+                   ((test-data-rollup)             (apply db:test-data-rollup dbstruct params))
+                   ((csv->test-data)               (apply db:csv->test-data dbstruct params))
+
+                   ;; MISC
+                   ((sync-inmem->db)               (let ((run-id (car params)))
+                                                     (db:sync-touched dbstruct run-id force-sync: #t)))
+                   ((mark-incomplete)              (apply db:find-and-mark-incomplete dbstruct params))
+                   ((create-all-triggers)          (db:create-all-triggers dbstruct))
+                   ((drop-all-triggers)            (db:drop-all-triggers dbstruct)) 
+
+                   ;; TESTMETA
+                   ((testmeta-add-record)       (apply db:testmeta-add-record dbstruct params))
+                   ((testmeta-update-field)     (apply db:testmeta-update-field dbstruct params))
+                   ((get-tests-tags)            (db:get-tests-tags dbstruct))
+
+                   ;; TASKS
+                   ((tasks-add)                 (apply tasks:add dbstruct params))   
+                   ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params))
+                   ((tasks-get-last)            (apply tasks:get-last dbstruct params))
+
+		   ;; NO SYNC DB
+		   ((no-sync-set)               (apply db:no-sync-set         *no-sync-db* params))
+		   ((no-sync-get/default)       (apply db:no-sync-get/default *no-sync-db* params))
+		   ((no-sync-del!)              (apply db:no-sync-del!        *no-sync-db* params))
+		   ((no-sync-get-lock)          (apply db:no-sync-get-lock    *no-sync-db* params))
+		   
+                   ;; 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))
+
+                   ;;======================================================================
+                   ;; READ ONLY QUERIES
+                   ;;======================================================================
+
+                   ;; KEYS
+                   ((get-key-val-pairs)               (apply db:get-key-val-pairs dbstruct params))
+                   ((get-keys)                        (db:get-keys dbstruct))
+                   ((get-key-vals)                    (apply db:get-key-vals dbstruct params))
+                   ((get-target)                      (apply db:get-target dbstruct params))
+                   ((get-targets)                     (db:get-targets dbstruct))
+
+                   ;; ARCHIVES
+                   ((test-get-archive-block-info)     (apply db:test-get-archive-block-info dbstruct params))
+                   
+                   ;; TESTS
+                   ((test-toplevel-num-items)         (apply db:test-toplevel-num-items dbstruct params))
+                   ((get-test-info-by-id)	       (apply db:get-test-info-by-id dbstruct params))
+                   ((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-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))
+                   ((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))
+                   ((get-run-status)               (apply db:get-run-status dbstruct params))
+                   ((get-run-state)                (apply db:get-run-state dbstruct params))
+                   ((set-run-status)               (apply db:set-run-status dbstruct params))
+                   ((set-run-state-status)  			 (apply db:set-run-state-status dbstruct params))
+                   ((update-tesdata-on-repilcate-db) (apply db:update-tesdata-on-repilcate-db  dbstruct params)) 
+                   ((get-tests-for-run)            (apply db:get-tests-for-run dbstruct params))
+                   ((get-tests-for-run-state-status) (apply db:get-tests-for-run-state-status 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-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))
+                   ((get-prev-run-ids)             (apply db:get-prev-run-ids dbstruct params))
+                   ((get-run-ids-matching-target)  (apply db:get-run-ids-matching-target dbstruct params))
+                   ((get-runs-by-patt)             (apply db:get-runs-by-patt dbstruct params))
+                   ((get-run-name-from-id)         (apply db:get-run-name-from-id dbstruct params))
+                   ((get-main-run-stats)           (apply db:get-main-run-stats dbstruct params))
+                   ((get-var)                      (apply db:get-var dbstruct params))
+                   ((get-run-stats)                (apply db:get-run-stats dbstruct params))
+                   ((get-run-times)                (apply db:get-run-times dbstruct params)) 
+
+                   ;; STEPS
+                   ((get-steps-data)               (apply db:get-steps-data dbstruct params))
+                   ((get-steps-for-test)           (apply db:get-steps-for-test dbstruct params))
+		   ((get-steps-info-by-id)         (apply db:get-steps-info-by-id dbstruct params))
+
+                   ;; TEST DATA
+                   ((read-test-data)               (apply db:read-test-data dbstruct params))
+                   ((read-test-data-varpatt)       (apply db:read-test-data-varpatt dbstruct params))
+                   ((get-data-info-by-id)          (apply db:get-data-info-by-id dbstruct params)) 
+
+                   ;; MISC
+                   ((get-latest-host-load)         (apply db:get-latest-host-load dbstruct params))
+                   ((have-incompletes?)            (apply db:have-incompletes? dbstruct params))
+                   ((login)                        (apply db:login dbstruct params))
+                   ((general-call)                 (let ((stmtname   (car params))
+                                                         (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))	
+                   ;; TESTMETA
+                   ((testmeta-get-record)       (apply db:testmeta-get-record dbstruct params))
+
+                   ;; TASKS 
+                   ((find-task-queue-records)   (apply tasks:find-task-queue-records dbstruct params))
+		   (else
+		    (debug:print 0 *default-log-port* "ERROR: bad api call " cmd)
+		    (conc "ERROR: BAD api call " cmd))))))
+
+       
+       ;; save all stats
+       (let ((delta-t (- (current-milliseconds)
+			 start-t)))
+	 (hash-table-set! *db-api-call-time* cmd
+			  (cons delta-t (hash-table-ref/default *db-api-call-time* cmd '()))))
+       (if writecmd-in-readonly-mode
+           (begin
+             #;(common:telemetry-log (conc "api-out:"(->string cmd))
+                                   payload: `((params . ,params)
+                                              (ok-res . #t)))
+	     (vector #f res))
+           (begin
+             #;(common:telemetry-log (conc "api-out:"(->string cmd))
+                                   payload: `((params . ,params)
+                                              (ok-res . #f)))
+             (vector #t res))))))))
+
+;; http-server  send-response
+;;                 api:process-request
+;;                    db:*
+;;
+;; NB// Runs on the server as part of the server loop
+;;
+(define (api:process-request dbstruct $) ;; the $ is the request vars proc
+  (debug:print 4 *default-log-port* "server-id:"  *server-id*)
+  (let* ((cmd     ($ 'cmd))
+	 (paramsj ($ 'params))
+         (key     ($ 'key))   
+	 (params  (db:string->obj paramsj transport: 'http))) ;; incoming data from the POST (or is it a GET?)
+    (debug:print 4 *default-log-port* "cmd:" cmd " with params " params "key " key)
+    (if (equal? key *server-id*)
+      (begin
+        (set! *api-process-request-count* (+ *api-process-request-count* 1))
+ 	(let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
+	       (success (vector-ref resdat 0))
+	       (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
+	  (debug:print 4 *default-log-port* "res:" res)
+	  (if (not success)
+	      (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
+	  (if (> *api-process-request-count* *max-api-process-requests*)
+	      (set! *max-api-process-requests* *api-process-request-count*))
+	  (set! *api-process-request-count* (- *api-process-request-count* 1))
+	  ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
+	  ;; (rmt:dat->json-str
+	  ;;  (if (or (string? res)
+	  ;;          (list?   res)
+	  ;;          (number? res)
+	  ;;          (boolean? res))
+	  ;;      res 
+	  ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
+	  (db:obj->string res transport: 'http)))
+	(begin
+	  (debug:print 0 *default-log-port*   "Server refused to process request. Sever id mismatch. recived " key " expected:  " *server-id* ".\nOther arguments recived: cmd=" cmd " params = " params) 
+	  (db:obj->string (conc "Server refused to process request server-id mismatch: " key ", " *server-id*) transport: 'http)))))
+
 )

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -30,10 +30,13 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))
 (import dbmod)
+
+(declare (uses margsmod))
+(import margsmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================

Index: build.inc
==================================================================
--- build.inc
+++ build.inc
@@ -4,10 +4,11 @@
 #
 
 api.o : mofiles/apimod.o
 api.o : mofiles/commonmod.o
 api.o : mofiles/dbmod.o
+api.o : mofiles/tasks.o
 archive.o : mofiles/commonmod.o
 archive.o : mofiles/configfmod.o
 archive.o : mofiles/dbmod.o
 client.o : mofiles/commonmod.o
 client.o : mofiles/dbmod.o
@@ -21,10 +22,11 @@
 dashboard-context-menu.o : mofiles/commonmod.o
 dashboard-context-menu.o : mofiles/configfmod.o
 dashboard-context-menu.o : mofiles/dbmod.o
 dashboard-guimonitor.o : mofiles/commonmod.o
 dashboard-guimonitor.o : mofiles/dbmod.o
+dashboard-guimonitor.o : mofiles/tasks.o
 dashboard-tests.o : mofiles/commonmod.o
 dashboard-tests.o : mofiles/configfmod.o
 dashboard-tests.o : mofiles/dbmod.o
 dashboard.o : mofiles/apimod.o
 dashboard.o : mofiles/commonmod.o
@@ -58,18 +60,21 @@
 items.o : mofiles/configfmod.o
 launch.o : mofiles/commonmod.o
 launch.o : mofiles/configfmod.o
 launch.o : mofiles/dbmod.o
 lock-queue.o : mofiles/commonmod.o
+lock-queue.o : mofiles/tasks.o
 megatest.o : mofiles/apimod.o
 megatest.o : mofiles/commonmod.o
 megatest.o : mofiles/configfmod.o
 megatest.o : mofiles/dbmod.o
 megatest.o : mofiles/ods.o
 megatest.o : mofiles/rmtmod.o
 megatest.o : mofiles/servermod.o
 mofiles/apimod.o : mofiles/commonmod.o
+mofiles/apimod.o : mofiles/tasks.o
+mofiles/commonmod.o : mofiles/margsmod.o
 mofiles/configfmod.o : mofiles/commonmod.o
 mofiles/dbmod.o : mofiles/commonmod.o
 mofiles/dbmod.o : mofiles/configfmod.o
 mofiles/dbmod.o : mofiles/ods.o
 mofiles/dcommonmod.o : mofiles/commonmod.o
@@ -94,10 +99,11 @@
 mtut.o : mofiles/commonmod.o
 mtut.o : mofiles/configfmod.o
 newdashboard.o : mofiles/commonmod.o
 newdashboard.o : mofiles/configfmod.o
 newdashboard.o : mofiles/dbmod.o
+mofiles/pgdb.o : mofiles/margsmod.o
 process.o : mofiles/commonmod.o
 rmt.o : mofiles/apimod.o
 rmt.o : mofiles/commonmod.o
 rmt.o : mofiles/configfmod.o
 rmt.o : mofiles/dbmod.o
@@ -114,13 +120,14 @@
 server.o : mofiles/servermod.o
 subrun.o : mofiles/commonmod.o
 subrun.o : mofiles/configfmod.o
 subrun.o : mofiles/dbmod.o
 synchash.o : mofiles/dbmod.o
-tasks.o : mofiles/commonmod.o
-tasks.o : mofiles/configfmod.o
-tasks.o : mofiles/dbmod.o
+mofiles/tasks.o : mofiles/commonmod.o
+mofiles/tasks.o : mofiles/configfmod.o
+mofiles/tasks.o : mofiles/dbmod.o
+mofiles/tasks.o : mofiles/pgdb.o
 tcmt.o : mofiles/commonmod.o
 tdb.o : mofiles/commonmod.o
 tdb.o : mofiles/dbmod.o
 tdb.o : mofiles/ods.o
 tests.o : mofiles/commonmod.o

Index: cgisetup/models/pgdb.scm
==================================================================
--- cgisetup/models/pgdb.scm
+++ cgisetup/models/pgdb.scm
@@ -18,23 +18,25 @@
 
 ;;======================================================================
 
 (declare (unit pgdb))
 (declare (uses configf))
-
-;; I don't know how to mix compilation units and modules, so no module here.
-;;
-;; (module pgdb
-;;     (
-;;      open-pgdb
-;;      )
-;; 
-;; (import scheme)
-;; (import data-structures)
-;; (import chicken)
-
-(use typed-records (prefix dbi dbi:))
+(declare (uses configfmod))
+(declare (uses commonmod))
+(declare (uses margsmod))
+
+(module pgdb
+ *
+
+(import scheme)
+(import data-structures)
+(import chicken)
+(import commonmod)
+(import configfmod)
+(import margsmod)
+
+(import srfi-1 srfi-69 typed-records (prefix dbi dbi:))
 
 ;; given a configdat lookup the connection info and open the db
 ;;
 (define (pgdb:open configdat #!key (dbname #f)(dbispec #f))  
   (let ((pgconf (or dbispec
@@ -652,5 +654,6 @@
                         ((> i tab2-pages )
                         lst) 
                       (else 
 		  	(loop (+ i 1) (append   lst (list i)))))))
 
+)

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -26,11 +26,10 @@
 
 (declare (unit client))
 
 (declare (uses common))
 (declare (uses db))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -57,10 +57,13 @@
 (declare (uses configfmod))
 (import configfmod)
 
 (declare (uses servermod))
 (import servermod)
+
+(declare (uses margsmod))
+(import margsmod)
 
 (include "common_records.scm")
 
 ;;======================================================================
 ;; (require-library margs)

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -17,16 +17,19 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit commonmod))
+(declare (uses margsmod))
 
 (module commonmod
 	*
 	
 ;;(import scheme chicken data-structures extras files ports)
 (import scheme chicken)
+(import margsmod)
+
 (use data-structures extras files ports)
 (use 
   (prefix base64 base64:)
   (prefix sqlite3 sqlite3:) 
   (srfi 18)

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -30,10 +30,13 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses configfmod))
 (import configfmod)
+
+(declare (uses margsmod))
+(import margsmod)
 
 (include "common_records.scm")
 
 ;; return list (path fullpath configname)
 (define (find-config configname #!key (toppath #f))

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -33,10 +33,11 @@
 
 (declare (unit dashboard-guimonitor))
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks))
+(import tasks)
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -30,11 +30,13 @@
      matchable) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
 
 (declare (uses common))
-(declare (uses margs))
+(declare (uses margsmod))
+(import margsmod)
+
 (declare (uses items))
 (declare (uses db))
 (declare (uses configf))
 (declare (uses process))
 (declare (uses launch))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -32,10 +32,12 @@
 
 (declare (unit db))
 (declare (uses common))
 (declare (uses client))
 (declare (uses mt))
+(declare (uses margsmod))
+(import margsmod)
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses configfmod))

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -17,10 +17,13 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit env))
+
+(declare (uses margsmod))
+(import margsmod)
 
 (declare (uses commonmod))
 (import commonmod)
 
 (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -25,10 +25,14 @@
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+
+(declare (uses margsmod))
+(import margsmod)
+
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 
 (declare (uses commonmod))
 (import commonmod)

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -21,10 +21,13 @@
 (declare (unit genexample))
 (use posix regex matchable)
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses margsmod))
+(import margsmod)
 
 (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -42,13 +42,10 @@
 
 (declare (unit http-transport))
 
 (declare (uses common))
 (declare (uses db))
-;; (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-;; (declare (uses server))
-;; (declare (uses daemon))
 (declare (uses portlogger))
 (import portlogger)
 
 (declare (uses rmt))
 
@@ -64,10 +61,13 @@
 (declare (uses servermod))
 (import servermod)
 
 (declare (uses transport))
 (import transport)
+
+(declare (uses margsmod)])
+(import margsmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 ;; (include "js-path.scm")
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -41,10 +41,13 @@
 (declare (uses configfmod))
 (import configfmod)
 
 (declare (uses dbmod))
 (import dbmod)
+
+(declare (uses margsmod))
+(import margsmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -19,10 +19,11 @@
 (use (prefix sqlite3 sqlite3:) srfi-18)
 
 (declare (unit lock-queue))
 (declare (uses common))
 (declare (uses tasks))
+(import tasks)
 
 (declare (uses commonmod))
 (import commonmod)
 ;;======================================================================
 ;; attempt to prevent overlapping updates of rollup files by queueing

DELETED margs.scm
Index: margs.scm
==================================================================
--- margs.scm
+++ /dev/null
@@ -1,88 +0,0 @@
-;; Copyright 2007-2010, 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 margs))
-;; (declare (uses common))
-
-(define args:arg-hash (make-hash-table))
-
-(define (args:get-arg arg . default)
-  (if (null? default)
-      (hash-table-ref/default args:arg-hash arg #f)
-      (hash-table-ref/default args:arg-hash arg (car default))))
-
-(define (args:any? . args)
-  (not (null? (filter (lambda (x) x)
-		      (map args:get-arg args)))))
-
-(define (args:get-arg-from ht arg . default)
-  (if (null? default)
-      (hash-table-ref/default ht arg #f)
-      (hash-table-ref/default ht arg (car default))))
-
-(define (args:usage . args)
-  (if (> (length args) 0)
-      (apply print "ERROR: " args))
-  (if (string? help)
-      (print help)
-      (print "Usage: " (car (argv)) " ... "))
-  (exit 0))
-
- ;; one-of args defined
-(define (args:any-defined? . param)
-  (let ((res #f))
-    (for-each 
-     (lambda (arg)
-       (if (args:get-arg arg)(set! res #t)))
-     param)
-    res))
-
-;; args: 
-(define (args:get-args args params switches arg-hash num-needed)
-  (let* ((numargs (length args))
-	 (adj-num-needed (if num-needed (+ num-needed 2) #f)))
-    (if (< numargs (if adj-num-needed adj-num-needed 2))
-	(if (>= num-needed 1)
-	    (args:usage "No arguments provided")
-	    '())
-	(let loop ((arg (cadr args))
-		   (tail (cddr args))
-		   (remargs '()))
-	  (cond 
-	   ((member arg params) ;; args with params
-	    (if (< (length tail) 1)
-		(args:usage "param given without argument " arg)
-		(let ((val     (car tail))
-		      (newtail (cdr tail)))
-		  (hash-table-set! arg-hash arg val)
-		  (if (null? newtail) remargs
-		      (loop (car newtail)(cdr newtail) remargs)))))
-	   ((member arg switches)         ;; args with no params (i.e. switches)
-	    (hash-table-set! arg-hash arg #t)
-	    (if (null? tail) remargs
-		(loop (car tail)(cdr tail) remargs)))
-	   (else
-	    (if (null? tail)(append remargs (list arg)) ;; return the non-used args
-		(loop (car tail)(cdr tail)(append remargs (list arg))))))))
-    ))
-
-(define (args:print-args remargs arg-hash)
-  (print "ARGS: " remargs)
-  (for-each (lambda (arg)
-	      (print "   " arg "   " (hash-table-ref/default arg-hash arg #f)))
-	    (hash-table-keys arg-hash)))

ADDED   margsmod.scm
Index: margsmod.scm
==================================================================
--- /dev/null
+++ margsmod.scm
@@ -0,0 +1,99 @@
+;; Copyright 2007-2010, 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 margsmod))
+
+(module margsmod
+	*
+
+(import scheme chicken data-structures extras)	
+(import srfi-69 srfi-1)
+
+(define args:help #f)
+
+(define (args:set-help help)
+  (set! args:help help))
+  
+(define args:arg-hash (make-hash-table))
+
+(define (args:get-arg arg . default)
+  (if (null? default)
+      (hash-table-ref/default args:arg-hash arg #f)
+      (hash-table-ref/default args:arg-hash arg (car default))))
+
+(define (args:any? . args)
+  (not (null? (filter (lambda (x) x)
+		      (map args:get-arg args)))))
+
+(define (args:get-arg-from ht arg . default)
+  (if (null? default)
+      (hash-table-ref/default ht arg #f)
+      (hash-table-ref/default ht arg (car default))))
+
+(define (args:usage . args)
+  (if (> (length args) 0)
+      (apply print "ERROR: " args))
+  (if (string? args:help)
+      (print args:help)
+      (print "Usage: " (car (argv)) " ... "))
+  (exit 0))
+
+ ;; one-of args defined
+(define (args:any-defined? . param)
+  (let ((res #f))
+    (for-each 
+     (lambda (arg)
+       (if (args:get-arg arg)(set! res #t)))
+     param)
+    res))
+
+;; args: 
+(define (args:get-args args params switches arg-hash num-needed)
+  (let* ((numargs (length args))
+	 (adj-num-needed (if num-needed (+ num-needed 2) #f)))
+    (if (< numargs (if adj-num-needed adj-num-needed 2))
+	(if (>= num-needed 1)
+	    (args:usage "No arguments provided")
+	    '())
+	(let loop ((arg (cadr args))
+		   (tail (cddr args))
+		   (remargs '()))
+	  (cond 
+	   ((member arg params) ;; args with params
+	    (if (< (length tail) 1)
+		(args:usage "param given without argument " arg)
+		(let ((val     (car tail))
+		      (newtail (cdr tail)))
+		  (hash-table-set! arg-hash arg val)
+		  (if (null? newtail) remargs
+		      (loop (car newtail)(cdr newtail) remargs)))))
+	   ((member arg switches)         ;; args with no params (i.e. switches)
+	    (hash-table-set! arg-hash arg #t)
+	    (if (null? tail) remargs
+		(loop (car tail)(cdr tail) remargs)))
+	   (else
+	    (if (null? tail)(append remargs (list arg)) ;; return the non-used args
+		(loop (car tail)(cdr tail)(append remargs (list arg))))))))
+    ))
+
+(define (args:print-args remargs arg-hash)
+  (print "ARGS: " remargs)
+  (for-each (lambda (arg)
+	      (print "   " arg "   " (hash-table-ref/default arg-hash arg #f)))
+	    (hash-table-keys arg-hash)))
+)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -22,11 +22,13 @@
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (declare (uses common))
 ;; (declare (uses megatest-version))
-(declare (uses margs))
+(declare (uses margsmod))
+(import margsmod)
+
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))
@@ -37,10 +39,13 @@
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
+(import tasks)
+(declare (uses tasks.import))
+
 (declare (uses env))
 (declare (uses diff-report))
 ;; (declare (uses ftail))
 ;; (import ftail)
 

Index: mtexec.scm
==================================================================
--- mtexec.scm
+++ mtexec.scm
@@ -26,11 +26,13 @@
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      )
 
 ;; (declare (uses common))
-(declare (uses margs))
+(declare (uses margsmod))
+(import margsmod)
+
 (declare (uses configf))
 ;; (declare (uses rmt))
 
 (declare (uses configfmod))
 (import configfmod)

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -27,11 +27,13 @@
      (prefix dbi dbi:)
      (prefix sqlite3 sqlite3:)
      nanomsg)
 
 (declare (uses common))
-(declare (uses margs))
+(declare (uses margsmod))
+(import margsmod)
+
 (declare (uses configf))
 ;; (declare (uses rmt))
 
 (declare (uses commonmod))
 (import commonmod)

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -28,11 +28,12 @@
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors ;; defstruct
      (prefix dbi dbi:))
 
 (declare (uses common))
 (declare (uses megatest-version))
-(declare (uses margs))
+(declare (uses margsmod))
+(import margsmod)
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))

ADDED   pgdb.scm
Index: pgdb.scm
==================================================================
--- /dev/null
+++ pgdb.scm
@@ -0,0 +1,1 @@
+(include "cgisetup/models/pgdb.scm")

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -42,10 +42,13 @@
 (import dbmod)
 
 (declare (uses servermod))
 (import servermod)
 
+(declare (uses margsmod))
+(import margsmod)
+	 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -25,16 +25,15 @@
 
 (declare (unit server))
 
 (declare (uses common))
 (declare (uses db))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-;; (declare (uses synchash))
+(declare (uses margsmod))
+(import margsmod)
+
 (declare (uses http-transport))
-;;(declare (uses rpc-transport))
 (declare (uses launch))
-;; (declare (uses daemon))
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))

Index: sharedat.scm
==================================================================
--- sharedat.scm
+++ sharedat.scm
@@ -37,11 +37,11 @@
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
 ;; (import (prefix sqlite3 sqlite3:))
 ;; 
 (declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
+(declare (uses margsmod))
 ;; (declare (uses dcommon))
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses synchash))

Index: spublish.scm
==================================================================
--- spublish.scm
+++ spublish.scm
@@ -24,11 +24,11 @@
 (use format)
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
 
 ;(declare (uses configf))
 ;; (declare (uses tree))
-(declare (uses margs))
+(declare (uses margsmod))
 
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 ;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
 (include "sauth-paths.scm")

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -16,32 +16,31 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
+(declare (unit tasks))
+(declare (uses pgdb))
+(declare (uses commonmod))
+(declare (uses configfmod))
+(declare (uses dbmod))
+(declare (uses margsmod))
+
+(module tasks
+*
+
+(import scheme chicken data-structures extras)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
 (import (prefix sqlite3 sqlite3:))
-
-(declare (unit tasks))
-(declare (uses db))
-(declare (uses rmt))
-(declare (uses common))
-(declare (uses pgdb))
-
-;; (import pgdb) ;; pgdb is a module
-
-(declare (uses commonmod))
 (import commonmod)
-
-(declare (uses configfmod))
 (import configfmod)
-
-(declare (uses dbmod))
 (import dbmod)
+(import margsmod)
+(import pgdb)
 
 (include "task_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; Tasks db
 ;;======================================================================
 
@@ -1055,5 +1054,6 @@
 	    (tasks:sync-to-postgres configdat dest)
 	    (begin
 	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
 	      #f)))))
 
+)

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -26,13 +26,15 @@
 (use srfi-1 posix srfi-69 srfi-18 regex defstruct)
 
 (use trace)
 ;; (trace-call-sites #t)
 
-(declare (uses margs))
 (declare (uses rmt))
 (declare (uses common))
+(declare (uses margsmod))
+(import margsmod)
+
 ;; (declare (uses megatest-version))
 
 (declare (uses commonmod))
 (import commonmod)
 

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -30,10 +30,12 @@
 (declare (unit tdb))
 (declare (uses common))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
+(declare (uses margsmod))
+(import margsmod)
 
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -28,10 +28,12 @@
 (declare (uses tdb))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses server))
+(declare (uses margsmod))
+(import margsmod)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
 (require-library stml)
 

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -25,11 +25,11 @@
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit tree))
-(declare (uses margs))
+(declare (uses margsmod))
 (declare (uses launch))
 ;; (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))