Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -170,11 +170,11 @@
 
 runs.o : test_records.scm
 
 megatest.o : megatest-fossil-hash.scm megatest-version.scm
 
-rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm
+rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm
 
 common_records.scm : altdb.scm
 
 # mofiles/stml2.o : mofiles/cookie.o
 # configf.o : mofiles/commonmod.o

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -397,11 +397,11 @@
          (bup-restore-params  (list "-d" archive-path "restore" "-C" *toppath* archive-internal-path)))
 		 (debug:print-info 2 *default-log-port* "Restoring archived data to " *toppath* " from archive in " archive-path " ... " archive-internal-path)
 		 (run-n-wait bup-exe params: bup-restore-params print-cmd: "Running:"))
       (sleep 2)
       (db:multi-db-sync 
-       (db:setup #f)
+       (db:setup-db *dbstruct-dbs* *toppath* #f)
        'killservers
        ;'dejunk
        ;'adj-testids
        'old2new
        )

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -591,13 +591,13 @@
 ;;
 (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"))
-                (read-only (not (file-write-access? dbfile)))
-                (dbstruct (db:setup #t)))
+                 (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
+                 (read-only (not (file-write-access? dbfile)))
+                 (dbstruct (db:setup-db *dbstruct-dbs* *toppath* #f))) ;;  #t)))
 	    (debug:print 0 *default-log-port*
 			 "WARNING: Version mismatch!\n"
 			 "   expected: " (common:version-signature) "\n"
 			 "   got:      " (common:get-last-run-version))
             (cond
@@ -983,10 +983,14 @@
 		(set! *db-cache-path* dbpath)
 		;; ensure megatest area has .db
 		(let ((dbarea (conc *toppath* "/.db")))
 		  (if (not (file-exists? dbarea))
 		      (create-directory dbarea)))
+		;; ensure tmp area has .db
+		(let ((dbarea (conc dbpath "/.db")))
+		  (if (not (file-exists? dbarea))
+		      (create-directory dbarea)))
 		dbpath))
 	  #f)))
 
 (define (common:get-area-path-signature)
   (message-digest-string (md5-primitive) *toppath*))
@@ -1041,11 +1045,11 @@
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (define (common:watchdog)
   (debug:print-info 13 *default-log-port* "common:watchdog entered.")
   (if (launch:setup)
       (if (common:on-homehost?)
-	  (let ((dbstruct (db:setup #t)))
+	  (let ((dbstruct (db:setup-db *dbstruct-dbs* *toppath* #f))) ;;  #t)))
 	    (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct)
 	    (cond
 	     ((dbr:dbstruct-read-only dbstruct)
 	      (debug:print-info 13 *default-log-port* "loading read-only watchdog")
 	      (common:readonly-watchdog dbstruct))
@@ -1077,11 +1081,11 @@
 			 #t))))
     (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
     (if (and no-hurry (debug:debug-mode 18))
 	(rmt:print-db-stats))
     (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
-                              (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
+                              (if *dbstruct-dbs* (db:close-all *dbstruct-dbs*)) ;; one second allocated
 			      (if *task-db*    
 				  (let ((db (cdr *task-db*)))
 				    (if (sqlite3:database? db)
 					(begin
 					  (sqlite3:interrupt! db)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -22,14 +22,30 @@
 ;; Database access
 ;;======================================================================
 
 ;; dbstruct vector containing all the relevant dbs like main.db, megatest.db, run.db etc
 
-(use (srfi 18) extras tcp stack)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64 format dot-locking z3 typed-records matchable)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
+(use (srfi 18)
+     extras
+     tcp
+     stack
+     (prefix sqlite3 sqlite3:)
+     srfi-1
+     posix
+     regex
+     regex-case
+     srfi-69
+     csv-xml
+     s11n
+     md5
+     message-digest
+     (prefix base64 base64:)
+     format
+     dot-locking
+     z3
+     typed-records
+     matchable)
 
 (declare (unit db))
 (declare (uses common))
 (declare (uses dbmod))
 (declare (uses dbfile))
@@ -291,16 +307,16 @@
 	(db:get-db tmpdb-stack) ;; get previously opened db (will create new db handle if all in the stack are already used
         (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10))
                (dbpath       (db:dbfile-path ))      ;; path to tmp db area
 	       (dbname       (db:run-id->dbname run-id))
                (dbexists     (common:file-exists? dbpath))
-	       (mtdbfname    (conc *toppath* "/.db/"dbname))
+	       (mtdbfname    (conc *toppath* "/"dbname))
                (mtdbexists   (common:file-exists? mtdbfname))
                (mtdbmodtime  (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbfname)  #f))
                (mtdb         (db:open-megatest-db mtdbfname))
 	       ;; the reference db for syncing
-	       (refdbfname   (conc dbpath "/ref_"dbname))
+	       (refdbfname   (conc dbpath "/"dbname"_ref"))
                (refndb       (db:open-megatest-db refdbfname))
                ;; (mtdbpath     (db:dbdat-get-path mtdb))
 	       ;; the tmpdb
 	       (tmpdbfname   (conc dbpath"/"dbname)) ;; /tmp/<stuff>/.db/[main|1,2...].db 
                (tmpdb        (db:open-megatest-db tmpdbfname)) ;; lock-create-open dbpath db:initialize-main-db))
@@ -359,15 +375,15 @@
         last-update-time))
 ;))
 
 ;; set up a single db (e.g. main.db, 1.db ... etc.)
 ;;
-(define (db:setup-db dbstructs run-id)
+(define (db:setup-db dbstructs areapath run-id)
   (let* ((dbname   (db:run-id->dbname run-id))
 	 (dbstruct (or (hash-table-ref/default dbstructs dbname #f)
 		       (make-dbr:dbstruct))))
-    (db:open-db dbstruct run-id areapath: areapath do-sync: do-sync)
+    (db:open-db dbstruct run-id areapath: areapath do-sync: #t)
     (hash-table-set! dbstructs dbname dbstruct)
     dbstruct))
     
 
 ;; Make the dbstruct, setup up auxillary db's and call for main db at least once

Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -36,18 +36,18 @@
 ;; NOTE: Need one dbr:dbstruct per main.db, 1.db ...
 ;;
 (defstruct dbr:dbstruct
   (dbname      #f)
   (dbdats      (make-hash-table))  ;; id => dbdat
-  ;; (tmpdbs      #f)
-  ;; (dbstack     #f) ;; stack for tmp db handles, do not initialize with a stack
-  ;; (mtdb        #f)
-  ;; (refndb      #f)
+  (tmpdb       #f)
+  (dbstack     #f) ;; stack for tmp db handles, do not initialize with a stack
+  (mtdb        #f)
+  (refndb      #f)
   (homehost    #f) ;; not used yet
   (on-homehost #f) ;; not used yet
   (read-only   #f)
-  ;; (stmt-cache  (make-hash-table))
+  (stmt-cache  (make-hash-table))
   )                ;; goal is to converge on one struct for an area but for now it is too confusing
   
 (defstruct dbr:dbdat
   (db          #f)    ;; should rename this to oddb for on disk db
   (tmpdb       #f)

DELETED fs-transport.scm
Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ /dev/null
@@ -1,52 +0,0 @@
-
-;; Copyright 2006-2012, 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/>.
-
-(require-extension (srfi 18) extras tcp s11n)
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
-(import (prefix sqlite3 sqlite3:))
-
-(use spiffy uri-common intarweb http-client spiffy-request-vars)
-
-(tcp-buffer-size 2048)
-
-(declare (unit fs-transport))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tests))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-
-;;======================================================================
-;; F S   T R A N S P O R T   S E R V E R
-;;======================================================================
-
-;; There is no "server" per se but a convience routine to make it non
-;; necessary to be reopening the db over and over again.
-;;
-
-(define (fs:process-queue-item packet)
-  (if (not *dbstruct-db*) ;; we will require that (setup-for-run) has already been called
-      (set! *dbstruct-db* (db:setup-db)))
-  (debug:print-info 11 *default-log-port* "fs:process-queue-item called with packet=" packet)
-  (db:process-queue-item *dbstruct-db* packet))
-      

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -97,11 +97,11 @@
 				      (dat ($ 'dat))
 				      (res #f))
 				 (cond
 				  ((equal? (uri-path (request-uri (current-request)))
 					   '(/ "api"))
-				   (send-response body:    (api:process-request *dbstruct-db* $) ;; the $ is the request vars proc
+				   (send-response body:    (api:process-request *dbstruct-dbs* $) ;; the $ is the request vars proc
 						  headers: '((content-type text/plain)))
 				   (mutex-lock! *heartbeat-mutex*)
 				   (set! *db-last-access* (current-seconds))
 				   (mutex-unlock! *heartbeat-mutex*))
 				  ((equal? (uri-path (request-uri (current-request))) 
@@ -458,14 +458,14 @@
     (let loop ((count         0)
 	       (server-state 'available)
 	       (bad-sync-count 0)
 	       (start-time     (current-milliseconds)))
       ;; Use this opportunity to sync the tmp db to megatest.db
-      (if (not server-going) ;; *dbstruct-db* 
+      (if (not server-going) ;; *dbstruct-dbs* 
 	  (begin
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
-	    (set! *dbstruct-db*  (db:setup #t)) ;;  run-id))
+	    (set! *dbstruct-dbs*  (db:setup #t)) ;;  run-id)) FIXME!!!
 	    (set! server-going #t)
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
 	    (thread-start! *watchdog*)))
       
       ;; when things go wrong we don't want to be doing the various queries too often

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -41,15 +41,18 @@
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import dbmod)
+(import dbmod
+	dbfile)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -2295,22 +2298,22 @@
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close patch-db #f)
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct full: #t))
+      (let ((dbstructs (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstructs full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct))
+      (let ((dbstructs (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstructs))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
       (if (not (launch:setup))
@@ -2362,14 +2365,14 @@
 
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
-	   (dbstruct (if (and toppath
-                              (common:on-homehost?))
-                         (db:setup #t)
-                         #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
+	   (dbstructs (if (and toppath
+                               (common:on-homehost?))
+                          (db:setup #t)
+                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
 	    ;;
@@ -2382,15 +2385,16 @@
 	    ;; EOF
 
 	    (repl))
 	   (else
 	    (begin
-	      (set! *db* dbstruct)
+	      (set! *db* dbstructs)
 	      (import extras) ;; might not be needed
 	      ;; (import csi)
 	      (import readline)
 	      (import apropos)
+	      (import dbfile)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 
 	      (if *use-new-readline*
 		  (begin
 		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -368,28 +368,28 @@
 			     (loop (car tal)(cdr tal) newmax-cmd currmax)))))))
     (mutex-unlock! *db-stats-mutex*)
     res))
 
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
-  (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
-	 (db-file-path   (db:dbfile-path)) ;;  0))
-	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
-	 (read-only      (not (file-write-access? db-file-path)))
-	 (start          (current-milliseconds))
-	 (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:print 0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn) ", exn=" 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
-				    (vector #t '()))))  ;; we could also check that the returned types are valid
-			     (vector #t '())))
+  (let* ((qry-is-write    (not (member cmd api:read-only-queries)))
+	 (db-file-path    (db:dbfile-path)) ;;  0))
+	 (dbstructs-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
+	 (read-only       (not (file-write-access? db-file-path)))
+	 (start           (current-milliseconds))
+	 (resdat          (if (not (and read-only qry-is-write))
+			      (let ((v (api:execute-requests dbstructs-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:print 0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn) ", exn=" 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
+				     (vector #t '()))))  ;; we could also check that the returned types are valid
+			      (vector #t '())))
 	 (success        (vector-ref resdat 0))
 	 (res            (vector-ref resdat 1))
 	 (duration       (- (current-milliseconds) start)))
     (if (and read-only qry-is-write)
         (debug:print 0 *default-log-port* "ERROR: attempt to write to read-only database ignored. cmd=" cmd))