Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1463,62 +1463,85 @@
 	#f
 	(simple-run-id (car runs)))))
 
 ;; called with run-id=#f so will operate on main.db
 ;;
-(define (db:insert-run dbstruct target runname run-meta)
+(define (db:insert-run dbstruct run-id target runname run-meta)
   (let* ((keys (db:get-keys dbstruct))
      	 (runs (db:simple-get-runs dbstruct runname #f #f target #f))) ;; runpatt count offset target last-update
     ;; need to insert run based on target and runname
     (let* ((targvals (string-split target "/"))
 	   (keystr   (string-intersperse keys ","))
 	   (key?str  (string-intersperse (make-list (length targvals) "?") ","))
-	   (qrystr   (conc "INSERT INTO runs (runname,"keystr") VALUES (?,"key?str")"))
+	   (qrystr   (conc "INSERT INTO runs (id,runname,"keystr") VALUES (?,?,"key?str")"))
 	   (get-var  (lambda (db qrystr)
 		       (let* ((res #f))
 			 (sqlite3:for-each-row
 			  (lambda row
 			    (set res (car row)))
-			  db qrystr runname)
+			  db qrystr run-id runname)
 			 res))))
       (if (null? runs)
-	  (db:create-initial-run-record dbstruct runname target))
-      (let* ((run-id (db:get-run-id dbstruct runname target)))
-	(db:with-db
+        (begin
+	  (db:create-initial-run-record dbstruct run-id runname target)
+        )
+      )
+      (let* ()
+        ;;(debug:print 0 *default-log-port* "db:insert-run: Calling db:with-db to update the run record")
+        (debug:print 0 *default-log-port* "db:insert-run: runid = " run-id)
+#; (db:with-db
 	 dbstruct
 	 #f #t
 	 (lambda (dbdat db)
+           (debug:print 0 *default-log-port* "In the lambda proc for " dbdat " " db)
 	   (for-each
 	    (lambda (keyval)
+              (debug:print 0 *default-log-port* "In the lambda proc for " keyval)
 	      (let* ((fieldname (car keyval))
 		     (getqry    (conc "SELECT "fieldname" FROM runs WHERE id=?;"))
 		     (setqry    (conc "UPDATE runs SET "fieldname"=? WHERE id=?;"))
 		     (val       (cdr keyval))
 		     (valnum    (if (number? val)
 				    val
 				    (if (string? val)
 					(string->number val)
 					#f))))
+                (debug:print 0 *default-log-port* "fieldname " fieldname " val " val " valnum " valnum)
 		(if (not (member fieldname (cons "runname" keys))) ;; don't attempt to tweak these
 		    (let* ((curr-val (get-var db getqry))
 			   (have-it  (or (equal? curr-val val)
 					 (equal? curr-val valnum))))
+                      (debug:print 0 *default-log-port* "have-it = " have-it)
 		      (if (not have-it)
-			  (sqlite3:execute db setqry (or valnum val) run-id))))))
+                        (begin
+                          (debug:print 0 *default-log-port* "Do sqlite3:execute")
+			  ;; (sqlite3:execute db setqry (or valnum val) run-id)
+                        )
+                      )
+                    )
+                 )
+                (debug:print 0 *default-log-port* "Done with update")
+              )
+              (debug:print 0 *default-log-port* "next keyval")
+            )
 	    run-meta)))
 	run-id))))
   
-(define (db:create-initial-run-record dbstruct runname target)	  
+(define (db:create-initial-run-record dbstruct run-id runname target)	  
   (let* ((keys     (db:get-keys dbstruct))
      	 (targvals (string-split target "/"))
 	 (keystr   (string-intersperse keys ","))
-	 (key?str  (string-intersperse (make-list (length targvals) "?") ","))
-	 (qrystr   (conc "INSERT INTO runs (runname,"keystr") VALUES (?,"key?str")")))
+	 (key?str  (string-intersperse (make-list (length targvals) "?") ",")) ;; a string with the same length as targvals, where each element is "?" and interspersed with commas.
+	 (qrystr   (conc "INSERT INTO runs (id,runname,"keystr") VALUES (?,?,"key?str")")))
+    (debug:print 0 *default-log-port* "db:create-initial-run-record")
+    (debug:print 0 *default-log-port* "qrystr = " qrystr)
+
     (db:with-db
-     dbstruct #f #t
+     dbstruct #f #t ;; run-id writable
      (lambda (dbdat db)
-       (apply sqlite3:execute db qrystr runname targvals)))))
+       (debug:print 0 *default-log-port* "lambda proc: dbdat: " dbdat " db: " db) 
+       (apply sqlite3:execute db qrystr run-id runname targvals)))))
 
 (define (db:insert-test dbstruct run-id test-rec)
   (let* ((testname  (alist-ref "testname" test-rec equal?))
 	 (item-path (alist-ref "item_path" test-rec equal?))
 	 (id        (db:get-test-id dbstruct run-id testname item-path))
@@ -1528,11 +1551,11 @@
 						     (conc (car dat)"=?"))
 						   fieldvals)
 					      ",")" WHERE id=?;"))
 	 (insqry   (conc "INSERT INTO tests ("(string-intersperse (map (lambda (x) (car x)) fieldvals) ",")
 			 ") VALUES ("(string-intersperse (make-list (length fieldvals) "?") ",")");")))
-    (debug:print 0 *default-log-port* "id: "id"\nset: "setqry"\ninsqry: "insqry)
+    ;; (debug:print 0 *default-log-port* "id: "id"\nset: "setqry"\ninsqry: "insqry)
     (db:with-db
      dbstruct
      run-id #t
      (lambda (dbdat db)
        (if id

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -136,11 +136,11 @@
 			      (loop (- count 1)))
 			    (begin
 			      (debug:print-info 0 *default-log-port* "dbmod:with-db, database is busy, giving up.")
 			      (exit 1))))
 		   (exn ()
-			(dbfile:print-err exn "ERROR: Unknown error with database for run-id "run-id", message: "
+			(dbfile:print-err exn "ERROR: dbmod:with-db: Unknown error with database for run-id "run-id", message: "
 					  ((condition-property-accessor 'exn 'message) exn))
 			(exit 2))))))
       (if use-mutex (mutex-unlock! *db-with-db-mutex*))
       res)))
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -257,10 +257,11 @@
   -debug N|N,M,O...       : enable debug 0-N or N and M and O ...
   -debug-noprop N|M,M,O...: enable debug but do not propagate to subprocesses via MT_DEBUG
   -config fname           : override the megatest.config file with fname
   -append-config fname    : append fname to the megatest.config file
   -import-sexpr fname     : import a sexpr file (use -list-runs % -dumpmode sexpr to create)
+  -remove-dbs all         : remove Megatest DBs before importing sexpr. (Use only with -import-sexpr)
   -regen-testfiles        : regenerate scripts and logpro files from testconfig, run in test context
   
 Utilities
   -env2file fname         : write the environment to fname.csh and fname.sh
   -envcap a               : save current variables labeled as context 'a' in file envdat.db
@@ -379,10 +380,11 @@
 			"-envcap"
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
 			"-import-sexpr"
+                        "-remove-dbs" ;; to be used only with -import-sexpr to remove megatest dbs first.
 			"-period"  ;; sync period in seconds
 			"-timeout" ;; exit sync if timeout in seconds exceeded since last change
 
                         ;; move runs stuff here
                         "-remove-keep"           
@@ -1047,16 +1049,16 @@
 
 
 
 
 (if (args:get-arg "-kill-servers")
-
+  
   (let* ((tl (launch:setup)) ;; need this to initialize *toppath*
         (servdir (tt:get-servinfo-dir *toppath*))
         (servfiles (glob (conc servdir "/*:*.db")))
         (fmtstr  "~10a~22a~10a~25a~25a~8a\n")
-        (dbfiles (append (glob (conc *toppath* "/.mtdb/main.db")) (glob (conc *toppath* "/.mtdb/?.db"))(glob (conc *toppath* "/.mtdb/??.db"))))
+        (dbfiles (if (file-exists? (conc *toppath* "/.mtdb/main.db")) (append (glob (conc *toppath* "/.mtdb/main.db")) (glob (conc *toppath* "/.mtdb/?.db"))(glob (conc *toppath* "/.mtdb/??.db"))) '()))
         (ttdat (make-tt areapath: *toppath*))
      )
      (format #t fmtstr "DB" "host:port" "PID" "age" "last mod" "state")
      (for-each
         (lambda (dbfile)
@@ -2628,14 +2630,31 @@
        'old2new
        )
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-import-sexpr")
-    (begin
-      (launch:setup)
-      (rmt:import-sexpr (args:get-arg "-import-sexpr"))
-      (set! *didsomething* #t)))
+ (let*(
+   (toppath (launch:setup))
+   (tmppath (common:make-tmpdir-name toppath "")))
+   (if (file-exists? (conc toppath "/.mtdb")) 
+     (if (args:get-arg "-remove-dbs")
+       (let* ((dbfiles (conc toppath "/.mtdb/* " tmppath "/*")))
+        (debug:print 0 *default-log-port* "Removing db files: " dbfiles)
+        (system (conc "rm -rvf " dbfiles))
+       )
+       (begin
+         (debug:print 0 *default-log-port* "ERROR: Cannot import sexpr with an existing DB present.")
+         (debug:print 0 *default-log-port* "Add '-remove-dbs all'  to remove the current Megatest DBs.")
+         (set! *didsomething* #t)
+         (exit)
+       )
+     )
+     (debug:print 0 *default-log-port* "Did not find " (conc toppath "/.mtdb"))
+   )
+   (db:setup)
+   (rmt:import-sexpr (args:get-arg "-import-sexpr"))
+   (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to-megatest.db")
     (let* ((duh      (launch:setup))
 	   (dbstruct (db:setup))
 	   (tmpdbpth (dbr:dbstruct-tmppath dbstruct))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -79,10 +79,11 @@
 	newremote)))
 
 ;; NB// area-dat replaced by ttdat
 ;; 
 (define (rmt:send-receive cmd run-id params #!key (attemptnum 1)(ttdat #f))
+  (assert (or (not run-id) (number? run-id)) "FATAL: run-id is required to be a number or #f")
   (assert *toppath* "FATAL: rmt:send-receive called with *toppath* not set.")
   (let* ((areapath      *toppath*) ;; TODO - resolve from dbstruct to be compatible with multiple areas
 	 (readonly-mode (rmtmod:calc-ro-mode ttdat *toppath*))
 	 (testsuite     (common:get-testsuite-name)))
     (case (rmt:transport-mode)

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -86,33 +86,41 @@
 (define (rmt:import-run target run-dat)
   (let* ((runname    (car run-dat))
 	 (all-dat    (cdr run-dat))
 	 (tests-data (alist-ref "data" all-dat equal?))
 	 (run-meta   (alist-ref "meta" all-dat equal?))
-	 (run-id     (rmt:insert-run target runname run-meta)))
+         (run-id     (string->number (alist-ref "id"   run-meta equal?))))
+
+    (rmt:insert-run run-id target runname run-meta)
     (for-each
      (lambda (test-dat)
        (let* ((test-id  (car test-dat))
 	      (test-rec (cdr test-dat)))
 	 (rmt:insert-test run-id test-rec)))
      tests-data)))
 
 ;; insert run if not there, return id either way
-(define (rmt:insert-run target runname run-meta)
+(define (rmt:insert-run run-id target runname run-meta)
   ;; look for id, return if found
   (debug:print 0 *default-log-port* "Insert run: "target"/"runname)
   (let* ((runs (rmtmod:send-receive 'simple-get-runs #f
 				    ;;    runpatt count offset target last-update)
 				    (list runname #f    #f     target #f))))
     (if (null? runs)
-	(rmtmod:send-receive 'insert-run #f (list target runname run-meta))
-	(simple-run-id (car runs)))))
+       (begin
+        (debug:print 0 *default-log-port* "inserting run for runname " runname " target " target)
+	(rmtmod:send-receive 'insert-run #f (list run-id target runname run-meta))
+       )
+       (begin
+        (debug:print 0 *default-log-port* "Found run-id " (simple-run-id (car runs)) " for runname " runname " target " target)
+	(simple-run-id (car runs)
+        )
+       ))))
 
 (define (rmt:insert-test run-id test-rec)
   (let* ((testname  (alist-ref "testname" test-rec equal?))
 	 (item-path (alist-ref "item_path" test-rec equal?)))
-    (debug:print 0 *default-log-port* "   Insert test in run "run-id": "testname"/"item-path)
     (rmtmod:send-receive 'insert-test run-id test-rec)))
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================